aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2016-06-27 16:45:45 +0200
committerAurelien Jarno <aurelien@aurel32.net>2016-06-27 23:57:40 +0200
commit0cdaef4dac5a885af9848e158e77cc347ee781bb (patch)
tree0b991e0eb1fb11fd9fcdd8abd1c276ad807a9010
parent30dcf959d2ab76f0bc8b5bc147c35319a6a2ba08 (diff)
downloadglibc-0cdaef4dac5a885af9848e158e77cc347ee781bb.zip
glibc-0cdaef4dac5a885af9848e158e77cc347ee781bb.tar.gz
glibc-0cdaef4dac5a885af9848e158e77cc347ee781bb.tar.bz2
MIPS: run tst-mode-switch-{1,2,3}.c using test-skeleton.c
For some reasons I have not investigated yet, tst-mode-switch-1 hangs on a MIPS UTM-8 machine running an o32 userland and a 3.6.1 kernel. This patch changes the test so that it runs under the test-skeleton framework, causing the test to fail after a timeout instead of hanging the whole testsuite. At the same time, also change the tst-mode-switch-2 and tst-mode-switch-3 tests. Changelog: * sysdeps/mips/tst-mode-switch-1.c (main): Converted to ... (do_test): ... this. (TEST_FUNCTION): New macro. Include test-skeleton.c. * sysdeps/mips/tst-mode-switch-2.c (main): Likewise. * sysdeps/mips/tst-mode-switch-3.c (main): Likewise.
-rw-r--r--ChangeLog9
-rw-r--r--sysdeps/mips/tst-mode-switch-1.c7
-rw-r--r--sysdeps/mips/tst-mode-switch-2.c7
-rw-r--r--sysdeps/mips/tst-mode-switch-3.c7
4 files changed, 24 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 47c12b4..3990d5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-06-27 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/mips/tst-mode-switch-1.c (main): Converted to ...
+ (do_test): ... this.
+ (TEST_FUNCTION): New macro.
+ Include test-skeleton.c.
+ * sysdeps/mips/tst-mode-switch-2.c (main): Likewise.
+ * sysdeps/mips/tst-mode-switch-3.c (main): Likewise.
+
2016-06-27 Joseph Myers <joseph@codesourcery.com>
[BZ #15479]
diff --git a/sysdeps/mips/tst-mode-switch-1.c b/sysdeps/mips/tst-mode-switch-1.c
index 1a26e4c..ebbdd3d 100644
--- a/sysdeps/mips/tst-mode-switch-1.c
+++ b/sysdeps/mips/tst-mode-switch-1.c
@@ -71,8 +71,8 @@ thread_function (void * arg __attribute__ ((unused)))
return NULL;
}
-int
-main (void)
+static int
+do_test (void)
{
int count = sysconf (_SC_NPROCESSORS_ONLN);
if (count <= 0)
@@ -121,3 +121,6 @@ main (void)
return result;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../../test-skeleton.c"
diff --git a/sysdeps/mips/tst-mode-switch-2.c b/sysdeps/mips/tst-mode-switch-2.c
index b41acf4..83dad80 100644
--- a/sysdeps/mips/tst-mode-switch-2.c
+++ b/sysdeps/mips/tst-mode-switch-2.c
@@ -77,8 +77,8 @@ thread_function (void * arg __attribute__ ((unused)))
return NULL;
}
-int
-main (void)
+static int
+do_test (void)
{
int count = sysconf (_SC_NPROCESSORS_ONLN);
if (count <= 0)
@@ -161,3 +161,6 @@ main (void)
return result;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../../test-skeleton.c"
diff --git a/sysdeps/mips/tst-mode-switch-3.c b/sysdeps/mips/tst-mode-switch-3.c
index 65e2b5e..b0c7673 100644
--- a/sysdeps/mips/tst-mode-switch-3.c
+++ b/sysdeps/mips/tst-mode-switch-3.c
@@ -43,8 +43,8 @@ static jmp_buf env;
float check1 = 2.0;
double check2 = 3.0;
-int
-main (void)
+static int
+do_test (void)
{
int i;
int result = 0;
@@ -88,3 +88,6 @@ main (void)
return result;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../../test-skeleton.c"