diff options
| author | Ladar Levison <ladar@lavabit.com> | 2019-01-28 12:10:12 +0300 |
|---|---|---|
| committer | Ladar Levison <ladar@lavabit.com> | 2019-01-28 12:10:12 +0300 |
| commit | a873d1f1ad4c383b09cf7250d6e1828e34a50270 (patch) | |
| tree | 587b9ebf65f7b0161c25376078db1cd2f1d03da6 | |
| parent | 886c8684a648818fa66e3eaeee6464716b9d6320 (diff) | |
Updated missing binary test patch.
| -rw-r--r-- | lib/patches/memcached/1.0.18_fix_unittest_doesnotexist.patch | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/patches/memcached/1.0.18_fix_unittest_doesnotexist.patch b/lib/patches/memcached/1.0.18_fix_unittest_doesnotexist.patch index 852dc985..f24ac69c 100644 --- a/lib/patches/memcached/1.0.18_fix_unittest_doesnotexist.patch +++ b/lib/patches/memcached/1.0.18_fix_unittest_doesnotexist.patch @@ -1,24 +1,31 @@ diff --git a/libtest/unittest.cc b/libtest/unittest.cc -index a2843d2..e55a575 100644 +index a2843d2..a1922db 100644 --- a/libtest/unittest.cc +++ b/libtest/unittest.cc -@@ -618,15 +618,7 @@ static test_return_t application_doesnotexist_BINARY(void *) +@@ -618,14 +618,14 @@ static test_return_t application_doesnotexist_BINARY(void *) true_app.will_fail(); const char *args[]= { "--fubar", 0 }; -#if defined(__APPLE__) && __APPLE__ - ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args)); -#elif defined(__FreeBSD__) && __FreeBSD__ - ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args)); +- ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args)); -#else - ASSERT_EQ(Application::SUCCESS, true_app.run(args)); - ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.join()); -#endif -- ++ ++ Application::error_t rc = true_app.run(args); ++ if (rc == Application::SUCCESS) { ++ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.join()); ++ } ++ else { ++ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, rc); ++ } + test_zero(true_app.stdout_result().size()); - return TEST_SUCCESS; -@@ -877,7 +869,7 @@ static test_return_t get_free_port_TEST(void *) +@@ -877,7 +877,7 @@ static test_return_t get_free_port_TEST(void *) static test_return_t fatal_TEST(void *) { ASSERT_EQ(fatal_calls++, fatal::disabled_counter()); |