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
24
export SGCHECK_COMMAND
24
export SGCHECK_COMMAND
6
25
export GDB_COMMAND
25
export GDB_COMMAND
7
26
26
8
27
.EXPORT_ALL_VARIABLES: ;
9
28
10
27
valgrind:
29
valgrind:
11
28
	@echo make check LOG_COMPILER="\"$(VALGRIND_EXEC_COMMAND)\""
30
	@echo make check LOG_COMPILER="\"$(VALGRIND_EXEC_COMMAND)\""
12
29
31
13
30
32
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
618
  true_app.will_fail();
618
  true_app.will_fail();
19
619
619
20
620
  const char *args[]= { "--fubar", 0 };
620
  const char *args[]= { "--fubar", 0 };
29
621
#if defined(__APPLE__) && __APPLE__
621
  ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
22
622
  ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
23
623
#elif defined(__FreeBSD__) && __FreeBSD__
24
624
  ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
25
625
#else
26
626
  ASSERT_EQ(Application::SUCCESS, true_app.run(args));
27
627
  ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.join());
28
628
#endif
30
629
622
31
630
  test_zero(true_app.stdout_result().size());
623
  test_zero(true_app.stdout_result().size());
32
631
624
Status:	Merged
Approved by:	Brian Aker on 2021-03-20
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tangent Trunk		2021-03-20	Pending
Review via email: mp+399947@code.launchpad.net