|
|
0304b1 |
nptl/tst-audit-threads: Switch to <support/test-driver.c>
|
|
|
0304b1 |
|
|
|
0304b1 |
The downstream version of test-skeleton.c does not include
|
|
|
0304b1 |
<support/support.h> for backwards compatibility reasons, leading to a
|
|
|
0304b1 |
compilation failure:
|
|
|
0304b1 |
|
|
|
0304b1 |
tst-audit-threads.c: In function 'do_test':
|
|
|
0304b1 |
tst-audit-threads.c:87:3: error: implicit declaration of function 'xcalloc' [-Werror=implicit-function-declaration]
|
|
|
0304b1 |
threads = (pthread_t *) xcalloc (num_threads, sizeof(pthread_t));
|
|
|
0304b1 |
^
|
|
|
0304b1 |
tst-audit-threads.c:87:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
|
|
|
0304b1 |
threads = (pthread_t *) xcalloc (num_threads, sizeof(pthread_t));
|
|
|
0304b1 |
^
|
|
|
0304b1 |
|
|
|
0304b1 |
diff --git a/nptl/tst-audit-threads.c b/nptl/tst-audit-threads.c
|
|
|
0304b1 |
index e4bf433bd85f3715..42742d51e4bc06a3 100644
|
|
|
0304b1 |
--- a/nptl/tst-audit-threads.c
|
|
|
0304b1 |
+++ b/nptl/tst-audit-threads.c
|
|
|
0304b1 |
@@ -25,19 +25,12 @@
|
|
|
0304b1 |
the relocation resolution caching code in the dynamic loader i.e.
|
|
|
0304b1 |
_dl_runtime_profile and _dl_profile_fixup. */
|
|
|
0304b1 |
|
|
|
0304b1 |
+#include <support/support.h>
|
|
|
0304b1 |
#include <support/xthread.h>
|
|
|
0304b1 |
#include <strings.h>
|
|
|
0304b1 |
#include <stdlib.h>
|
|
|
0304b1 |
#include <sys/sysinfo.h>
|
|
|
0304b1 |
|
|
|
0304b1 |
-static int do_test (void);
|
|
|
0304b1 |
-
|
|
|
0304b1 |
-/* This test usually takes less than 3s to run. However, there are cases that
|
|
|
0304b1 |
- take up to 30s. */
|
|
|
0304b1 |
-#define TIMEOUT 60
|
|
|
0304b1 |
-#define TEST_FUNCTION do_test ()
|
|
|
0304b1 |
-#include "../test-skeleton.c"
|
|
|
0304b1 |
-
|
|
|
0304b1 |
/* Declare the functions we are going to call. */
|
|
|
0304b1 |
#define externnum
|
|
|
0304b1 |
#include "tst-audit-threads.h"
|
|
|
0304b1 |
@@ -95,3 +88,8 @@ do_test (void)
|
|
|
0304b1 |
|
|
|
0304b1 |
return 0;
|
|
|
0304b1 |
}
|
|
|
0304b1 |
+
|
|
|
0304b1 |
+/* This test usually takes less than 3s to run. However, there are cases that
|
|
|
0304b1 |
+ take up to 30s. */
|
|
|
0304b1 |
+#define TIMEOUT 60
|
|
|
0304b1 |
+#include <support/test-driver.c>
|