diff options
Diffstat (limited to 'meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index abff4e9331..a274f3a16e 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch | |||
@@ -1,14 +1,15 @@ | |||
1 | From 2bbe20b4f69e84e7a18bc79d382486953f479328 Mon Sep 17 00:00:00 2001 | 1 | From 225abf37cd0b49960664b59f08e515a4c4ea5ad0 Mon Sep 17 00:00:00 2001 |
2 | From: Jeremy Puhlman <jpuhlman@mvista.com> | 2 | From: Jeremy Puhlman <jpuhlman@mvista.com> |
3 | Date: Thu, 26 Mar 2020 18:30:36 +0000 | 3 | Date: Thu, 26 Mar 2020 18:30:36 +0000 |
4 | Subject: [PATCH] Add option to disable timed dependant tests | 4 | Subject: [PATCH] Add option to disable timed dependant tests |
5 | 5 | ||
6 | The disabled tests rely on timing to pass correctly. On a virtualized | 6 | The disabled tests rely on timing to pass correctly. On a virtualized |
7 | system under heavy load, these tests randomly fail because they miss | 7 | system under heavy load, these tests randomly fail because they miss |
8 | a timer or other timing related issues. | 8 | a timer or other timing related issues. |
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | 11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> |
12 | |||
12 | --- | 13 | --- |
13 | configure.in | 6 ++++++ | 14 | configure.in | 6 ++++++ |
14 | include/apr.h.in | 1 + | 15 | include/apr.h.in | 1 + |
@@ -16,10 +17,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | |||
16 | 3 files changed, 9 insertions(+), 2 deletions(-) | 17 | 3 files changed, 9 insertions(+), 2 deletions(-) |
17 | 18 | ||
18 | diff --git a/configure.in b/configure.in | 19 | diff --git a/configure.in b/configure.in |
19 | index d9f32d6..f0c5661 100644 | 20 | index bfd488b..3663220 100644 |
20 | --- a/configure.in | 21 | --- a/configure.in |
21 | +++ b/configure.in | 22 | +++ b/configure.in |
22 | @@ -2886,6 +2886,12 @@ AC_ARG_ENABLE(timedlocks, | 23 | @@ -3023,6 +3023,12 @@ AC_ARG_ENABLE(timedlocks, |
23 | ) | 24 | ) |
24 | AC_SUBST(apr_has_timedlocks) | 25 | AC_SUBST(apr_has_timedlocks) |
25 | 26 | ||
@@ -45,10 +46,10 @@ index ee99def..c46a5f4 100644 | |||
45 | #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ | 46 | #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ |
46 | 47 | ||
47 | diff --git a/test/testlock.c b/test/testlock.c | 48 | diff --git a/test/testlock.c b/test/testlock.c |
48 | index a43f477..6233d0b 100644 | 49 | index e3437c1..04e01b9 100644 |
49 | --- a/test/testlock.c | 50 | --- a/test/testlock.c |
50 | +++ b/test/testlock.c | 51 | +++ b/test/testlock.c |
51 | @@ -396,13 +396,13 @@ abts_suite *testlock(abts_suite *suite) | 52 | @@ -535,7 +535,7 @@ abts_suite *testlock(abts_suite *suite) |
52 | abts_run_test(suite, threads_not_impl, NULL); | 53 | abts_run_test(suite, threads_not_impl, NULL); |
53 | #else | 54 | #else |
54 | abts_run_test(suite, test_thread_mutex, NULL); | 55 | abts_run_test(suite, test_thread_mutex, NULL); |
@@ -56,6 +57,8 @@ index a43f477..6233d0b 100644 | |||
56 | +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS | 57 | +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS |
57 | abts_run_test(suite, test_thread_timedmutex, NULL); | 58 | abts_run_test(suite, test_thread_timedmutex, NULL); |
58 | #endif | 59 | #endif |
60 | abts_run_test(suite, test_thread_nestedmutex, NULL); | ||
61 | @@ -543,7 +543,7 @@ abts_suite *testlock(abts_suite *suite) | ||
59 | abts_run_test(suite, test_thread_rwlock, NULL); | 62 | abts_run_test(suite, test_thread_rwlock, NULL); |
60 | abts_run_test(suite, test_cond, NULL); | 63 | abts_run_test(suite, test_cond, NULL); |
61 | abts_run_test(suite, test_timeoutcond, NULL); | 64 | abts_run_test(suite, test_timeoutcond, NULL); |
@@ -63,7 +66,4 @@ index a43f477..6233d0b 100644 | |||
63 | +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS | 66 | +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS |
64 | abts_run_test(suite, test_timeoutmutex, NULL); | 67 | abts_run_test(suite, test_timeoutmutex, NULL); |
65 | #endif | 68 | #endif |
66 | #endif | 69 | #ifdef WIN32 |
67 | -- | ||
68 | 2.23.0 | ||
69 | |||