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.
This commit is contained in:
Aurelien Jarno 2016-06-27 16:45:45 +02:00
parent 30dcf959d2
commit 0cdaef4dac
4 changed files with 24 additions and 6 deletions

View File

@ -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]

View File

@ -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"

View File

@ -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"

View File

@ -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"