diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-26 15:18:52 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-26 10:22:03 +0200 |
| commit | 66f59f040984bef5023fc844097b85bebee88f09 (patch) | |
| tree | 9d642302f19c7be7149b6c9e4a8ffbd8a99f9376 /lib/tdb/test/tap-interface.h | |
| parent | d1aeb2d1c3bfb87e9ab4079535867b40fb722fde (diff) | |
| download | samba-66f59f040984bef5023fc844097b85bebee88f09.tar.gz samba-66f59f040984bef5023fc844097b85bebee88f09.tar.bz2 samba-66f59f040984bef5023fc844097b85bebee88f09.zip | |
tdb: finish weaning off err.h.
Commit 3c4263e7580143c69225729f5b67f09c00add2fd said it removed err.h
from tdb, unfortuntely it didn't: tap-interface.h still included it.
This finishes it properly!
Reported-by:Stefan Metzmacher <metze@samba.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User(master): Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date(master): Tue Jun 26 10:22:03 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib/tdb/test/tap-interface.h')
| -rw-r--r-- | lib/tdb/test/tap-interface.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/tdb/test/tap-interface.h b/lib/tdb/test/tap-interface.h index 12d5f942b7..d9ed6e84ea 100644 --- a/lib/tdb/test/tap-interface.h +++ b/lib/tdb/test/tap-interface.h @@ -22,7 +22,6 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include <stdio.h> -#include <err.h> #ifndef __location__ #define __TAP_STRING_LINE1__(s) #s @@ -32,9 +31,9 @@ #endif #define plan_tests(num) -#define ok(e, ...) ((e) ? (void)printf(".") : errx(1, __VA_ARGS__)) +#define ok(e, ...) do { if (e) { (void)printf("."); } else { fprintf(stderr, __VA_ARGS__); exit(1); } } while(0) #define ok1(e) ok((e), "%s:%s", __location__, #e) #define pass(...) printf(".") -#define fail(...) errx(1, __VA_ARGS__) +#define fail(...) do { fprintf(stderr, __VA_ARGS__); exit(1); } while(0) #define diag printf #define exit_status() 0 |