This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.23/master updated. glibc-2.23-67-gcacad93
- From: aurel32 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jun 2016 22:03:44 -0000
- Subject: GNU C Library master sources branch release/2.23/master updated. glibc-2.23-67-gcacad93
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.23/master has been updated
via cacad9315ebcf5a0c067950500cc7c31b442af22 (commit)
from d16e36e575b7ac0c4ab74f43c9a752c631b943c9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cacad9315ebcf5a0c067950500cc7c31b442af22
commit cacad9315ebcf5a0c067950500cc7c31b442af22
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon Jun 27 16:45:45 2016 +0200
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.
(cherry picked from commit 0cdaef4dac5a885af9848e158e77cc347ee781bb)
diff --git a/ChangeLog b/ChangeLog
index 8e74828..0219113 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-21 Aurelien Jarno <aurelien@aurel32.net>
* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into
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"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
sysdeps/mips/tst-mode-switch-1.c | 7 +++++--
sysdeps/mips/tst-mode-switch-2.c | 7 +++++--
sysdeps/mips/tst-mode-switch-3.c | 7 +++++--
4 files changed, 24 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources