86f0ee9140
Fixes CVE-2016-6323
40 lines
1 KiB
Diff
40 lines
1 KiB
Diff
From 8c716c2e2f916bc18a3857129c181b96990a87d6 Mon Sep 17 00:00:00 2001
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
Date: Wed, 17 Aug 2016 16:14:02 +0200
|
|
Subject: [PATCH 11] nptl/tst-once5: Reduce time to expected failure
|
|
|
|
(cherry picked from commit 1f645571d2db9008b3cd3d5acb9ff93357864283)
|
|
---
|
|
ChangeLog | 5 +++++
|
|
nptl/tst-once5.cc | 2 ++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 1351bfd..3af5852 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,8 @@
|
|
+2016-08-17 Florian Weimer <fweimer@redhat.com>
|
|
+
|
|
+ Reduce time to expected nptl/tst-once5 failure.
|
|
+ * nptl/tst-once5.cc (TIMEOUT): Define.
|
|
+
|
|
2016-08-18 Florian Weimer <fweimer@redhat.com>
|
|
|
|
[BZ #16907]
|
|
diff --git a/nptl/tst-once5.cc b/nptl/tst-once5.cc
|
|
index 978d827..513ac53 100644
|
|
--- a/nptl/tst-once5.cc
|
|
+++ b/nptl/tst-once5.cc
|
|
@@ -75,5 +75,7 @@ do_test (void)
|
|
return result;
|
|
}
|
|
|
|
+// The test currently hangs and is XFAILed. Reduce the timeout.
|
|
+#define TIMEOUT 1
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|
|
--
|
|
2.7.4.GIT
|
|
|
|
|