| Message ID | 877eg5tf2p.fsf@oldenburg2.str.redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | nptl/tst-audit-threads: Switch to <support/test-driver.c> | expand |
* Florian Weimer: > This is a new test, so it should use the test driver in the support > subdirectory. > > 2018-12-19 Florian Weimer <fweimer@redhat.com> > > * nptl/tst-audit-threads.c: Switch to <support/test-driver.c>. > > diff --git a/nptl/tst-audit-threads.c b/nptl/tst-audit-threads.c > index e4bf433bd8..42742d51e4 100644 > --- a/nptl/tst-audit-threads.c > +++ b/nptl/tst-audit-threads.c > @@ -25,19 +25,12 @@ > the relocation resolution caching code in the dynamic loader i.e. > _dl_runtime_profile and _dl_profile_fixup. */ > > +#include <support/support.h> > #include <support/xthread.h> > #include <strings.h> > #include <stdlib.h> > #include <sys/sysinfo.h> > > -static int do_test (void); > - > -/* This test usually takes less than 3s to run. However, there are cases that > - take up to 30s. */ > -#define TIMEOUT 60 > -#define TEST_FUNCTION do_test () > -#include "../test-skeleton.c" > - > /* Declare the functions we are going to call. */ > #define externnum > #include "tst-audit-threads.h" > @@ -95,3 +88,8 @@ do_test (void) > > return 0; > } > + > +/* This test usually takes less than 3s to run. However, there are cases that > + take up to 30s. */ > +#define TIMEOUT 60 > +#include <support/test-driver.c> Okay despite the freeze? Thanks, Florian
On 02/01/19 6:34 PM, Florian Weimer wrote: > * Florian Weimer: > >> This is a new test, so it should use the test driver in the support >> subdirectory. >> >> 2018-12-19 Florian Weimer <fweimer@redhat.com> >> >> * nptl/tst-audit-threads.c: Switch to <support/test-driver.c>. >> >> diff --git a/nptl/tst-audit-threads.c b/nptl/tst-audit-threads.c >> index e4bf433bd8..42742d51e4 100644 >> --- a/nptl/tst-audit-threads.c >> +++ b/nptl/tst-audit-threads.c >> @@ -25,19 +25,12 @@ >> the relocation resolution caching code in the dynamic loader i.e. >> _dl_runtime_profile and _dl_profile_fixup. */ >> >> +#include <support/support.h> >> #include <support/xthread.h> >> #include <strings.h> >> #include <stdlib.h> >> #include <sys/sysinfo.h> >> >> -static int do_test (void); >> - >> -/* This test usually takes less than 3s to run. However, there are cases that >> - take up to 30s. */ >> -#define TIMEOUT 60 >> -#define TEST_FUNCTION do_test () >> -#include "../test-skeleton.c" >> - >> /* Declare the functions we are going to call. */ >> #define externnum >> #include "tst-audit-threads.h" >> @@ -95,3 +88,8 @@ do_test (void) >> >> return 0; >> } >> + >> +/* This test usually takes less than 3s to run. However, there are cases that >> + take up to 30s. */ >> +#define TIMEOUT 60 >> +#include <support/test-driver.c> > > Okay despite the freeze? OK. Siddhesh
diff --git a/nptl/tst-audit-threads.c b/nptl/tst-audit-threads.c index e4bf433bd8..42742d51e4 100644 --- a/nptl/tst-audit-threads.c +++ b/nptl/tst-audit-threads.c @@ -25,19 +25,12 @@ the relocation resolution caching code in the dynamic loader i.e. _dl_runtime_profile and _dl_profile_fixup. */ +#include <support/support.h> #include <support/xthread.h> #include <strings.h> #include <stdlib.h> #include <sys/sysinfo.h> -static int do_test (void); - -/* This test usually takes less than 3s to run. However, there are cases that - take up to 30s. */ -#define TIMEOUT 60 -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" - /* Declare the functions we are going to call. */ #define externnum #include "tst-audit-threads.h" @@ -95,3 +88,8 @@ do_test (void) return 0; } + +/* This test usually takes less than 3s to run. However, there are cases that + take up to 30s. */ +#define TIMEOUT 60 +#include <support/test-driver.c>