diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-17 13:05:25 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-17 13:05:25 +0200 |
| commit | dd0da89e841e5df0c1fe27122df0c1644278c65e (patch) | |
| tree | 75de1500ca458d977c36831491a9495738da9c2c /source4/lib | |
| parent | 0197b8e0ff8dc26eeb71dccf61d8937c63bacff5 (diff) | |
| parent | 4d8f3f190215edcdbeb1725cccdc962dc68cc1a0 (diff) | |
| download | samba-dd0da89e841e5df0c1fe27122df0c1644278c65e.tar.gz samba-dd0da89e841e5df0c1fe27122df0c1644278c65e.tar.bz2 samba-dd0da89e841e5df0c1fe27122df0c1644278c65e.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit ece878c1f9251b83598508e23ce0015b4db72f0a)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/talloc/testsuite.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c index fedbda95aa..3f06eee566 100644 --- a/source4/lib/talloc/testsuite.c +++ b/source4/lib/talloc/testsuite.c @@ -48,7 +48,8 @@ static double timeval_elapsed(struct timeval *tv) } #define torture_assert_str_equal(test, arg1, arg2, desc) \ - if (strcmp(arg1, arg2)) { \ + if (arg1 == NULL && arg2 == NULL) { \ + } else if (strcmp(arg1, arg2)) { \ printf("failure: %s [\n%s: Expected %s, got %s: %s\n]\n", \ test, __location__, arg1, arg2, desc); \ return false; \ |