libmemcached

Merge lp:~brianaker/libmemcached/unittest-fix into lp:libmemcached/1.0

  1. unittest-fix
  2. Merge into 1.0
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: 1199
Merged at revision: 1199
Proposed branch: lp:~brianaker/libmemcached/unittest-fix
Merge into: lp:libmemcached/1.0
Diff against target: 31 lines (+3/-8)
2 files modified
libtest/include.am (+2/-0)
libtest/unittest.cc (+1/-8)
To merge this branch: bzr merge lp:~brianaker/libmemcached/unittest-fix
Reviewer Review Type Date Requested Status
Tangent Trunk Pending
Review via email: mp+399947@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libtest/include.am'
2--- libtest/include.am 2014-02-12 11:06:30 +0000
3+++ libtest/include.am 2021-03-20 05:11:41 +0000
4@@ -24,6 +24,8 @@
5 export SGCHECK_COMMAND
6 export GDB_COMMAND
7
8+.EXPORT_ALL_VARIABLES: ;
9+
10 valgrind:
11 @echo make check LOG_COMPILER="\"$(VALGRIND_EXEC_COMMAND)\""
12
13
14=== modified file 'libtest/unittest.cc'
15--- libtest/unittest.cc 2014-01-19 12:59:53 +0000
16+++ libtest/unittest.cc 2021-03-20 05:11:41 +0000
17@@ -618,14 +618,7 @@
18 true_app.will_fail();
19
20 const char *args[]= { "--fubar", 0 };
21-#if defined(__APPLE__) && __APPLE__
22- ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
23-#elif defined(__FreeBSD__) && __FreeBSD__
24- ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
25-#else
26- ASSERT_EQ(Application::SUCCESS, true_app.run(args));
27- ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.join());
28-#endif
29+ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
30
31 test_zero(true_app.stdout_result().size());
32

Subscribers

People subscribed via source and target branches

to all changes: