summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/fs-tests/integrity/Makefile7
-rw-r--r--tests/fs-tests/integrity/integck.c17
2 files changed, 16 insertions, 8 deletions
diff --git a/tests/fs-tests/integrity/Makefile b/tests/fs-tests/integrity/Makefile
index 364a732..03652a2 100644
--- a/tests/fs-tests/integrity/Makefile
+++ b/tests/fs-tests/integrity/Makefile
@@ -13,12 +13,5 @@ TARGETS = integck
all: $(TARGETS)
-$(TARGETS): ../lib/tests.o
-
-../lib/tests.o: ../lib/tests.h
-
clean:
rm -f *.o $(TARGETS)
-
-tests: all
- ./integck
diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index 2dbe9de..387874c 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -36,7 +36,6 @@
#include <sys/vfs.h>
#include <sys/mount.h>
#include <sys/statvfs.h>
-#include "tests.h"
#define PROGRAM_VERSION "1.1"
#define PROGRAM_NAME "integck"
@@ -47,6 +46,22 @@
/* The pattern for the top directory where we run the test */
#define TEST_DIR_PATTERN "integck_test_dir_%u"
+/*
+ * Check if a condition is true and die if not.
+ */
+#define stringify1(x) #x
+#define stringify(x) stringify1(x)
+#define CHECK(cond) do { \
+ if (!(cond)) { \
+ int _err = errno; \
+ fflush(stdout); \
+ errmsg("condition '%s' failed at %s:%d\n", \
+ stringify(cond), __FILE__, __LINE__); \
+ errmsg("error %d (%s)\n", _err, strerror(_err)); \
+ exit(EXIT_FAILURE); \
+ } \
+} while(0)
+
/* The variables below are set by command line arguments */
static struct {
long repeat_cnt;