diff options
| author | Ivo De Decker <ivo.dedecker@ugent.be> | 2013-05-10 13:33:02 +0200 |
|---|---|---|
| committer | Ivo De Decker <ivo.dedecker@ugent.be> | 2013-05-10 13:33:02 +0200 |
| commit | 31202ad025bcdeb2585d18dc3f4641b5cf9c0ec4 (patch) | |
| tree | 32c20d66684ac97b86e55495146e9a676bfae85a /lib/subunit/c | |
| parent | 2865eba17fddda6c49f1209ca92d539111e7ff93 (diff) | |
| download | samba-31202ad025bcdeb2585d18dc3f4641b5cf9c0ec4.tar.gz | |
Imported Upstream version 4.0.0+dfsg1upstream/4.0.0+dfsg1
Diffstat (limited to 'lib/subunit/c')
| -rw-r--r-- | lib/subunit/c/tests/test_child.c | 3 | ||||
| -rw-r--r-- | lib/subunit/c/wscript | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/subunit/c/tests/test_child.c b/lib/subunit/c/tests/test_child.c index 0744599b9f..1318322ab2 100644 --- a/lib/subunit/c/tests/test_child.c +++ b/lib/subunit/c/tests/test_child.c @@ -16,6 +16,7 @@ **/ #include <stdlib.h> +#include <stdio.h> #include <unistd.h> #include <string.h> #include <check.h> @@ -57,6 +58,8 @@ test_stdout_function(char const * expected, * DEAL. */ function(); + /* flush writes on FILE object to file descriptor */ + fflush(stdout); /* restore stdout now */ if (dup2(old_stdout, 1) != 1) { close(old_stdout); diff --git a/lib/subunit/c/wscript b/lib/subunit/c/wscript index 3e5311d79f..f308b33e0f 100644 --- a/lib/subunit/c/wscript +++ b/lib/subunit/c/wscript @@ -3,7 +3,7 @@ import Options def configure(conf): - if conf.CHECK_BUNDLED_SYSTEM('subunit', checkfunctions='subunit_test_start', headers='subunit/child.h'): + if conf.CHECK_BUNDLED_SYSTEM_PKG('subunit', pkg='libsubunit'): conf.define('USING_SYSTEM_SUBUNIT', 1) def build(bld): |