From 49b23c9be4ac6dc23aa1f8383976670b1d6bdd5b Mon Sep 17 00:00:00 2001 From: nsz Date: Sun, 21 Oct 2012 22:03:11 +0200 Subject: [PATCH] put everything back to one directory --- Makefile.inc | 7 ++- src/env/Makefile | 1 - src/general/Makefile | 8 ++++ src/{misc => general}/basename.c | 0 src/{misc => general}/dirname.c | 0 src/{ldso => general}/dlopen.c | 10 +++++ src/{ldso => general}/dlopen_dso.c | 0 src/{env => general}/env.c | 0 src/{stdio => general}/fdopen.c | 2 +- src/{regex => general}/fnmatch.c | 0 src/{stdio => general}/fscanf.c | 0 src/{multibyte => general}/mbc.c | 0 src/{stdio => general}/memstream.c | 0 src/{stdio => general}/popen.c | 0 src/{thread => general}/pthread.c | 0 src/{stdlib => general}/qsort.c | 0 src/{thread => general}/sem.c | 0 src/{stdio => general}/snprintf.c | 0 src/{process => general}/spawn.c | 0 src/{stdio => general}/sscanf.c | 0 src/{stdio => general}/sscanf_long.c | 0 src/{string => general}/string.c | 0 src/general/string_strchr.c | 52 ++++++++++++++++++++++ src/general/string_strcspn.c | 33 ++++++++++++++ src/{stdlib => general}/strtod.c | 0 src/{stdlib => general}/strtod_long.c | 0 src/{stdlib => general}/strtod_simple.c | 0 src/{stdlib => general}/strtof.c | 0 src/{stdlib => general}/strtol.c | 0 src/{stdlib => general}/strtold.c | 0 src/{stdio => general}/swprintf.c | 0 src/{env => general}/test.h | 0 src/{time => general}/time.c | 0 src/{thread => general}/tls_align.c | 0 src/{thread => general}/tls_align_dlopen.c | 0 src/{thread => general}/tls_align_dso.c | 0 src/{thread => general}/tls_init.c | 0 src/{stdio => general}/ungetc.c | 0 src/{stdlib => general}/wcstol.c | 0 src/ldso/Makefile | 3 -- src/ldso/test.h | 20 --------- src/misc/Makefile | 1 - src/misc/test.h | 20 --------- src/multibyte/Makefile | 1 - src/multibyte/test.h | 20 --------- src/process/Makefile | 1 - src/process/test.h | 20 --------- src/regex/Makefile | 1 - src/regex/test.h | 20 --------- src/stdio/Makefile | 1 - src/stdio/test.h | 20 --------- src/stdlib/Makefile | 3 -- src/stdlib/test.h | 20 --------- src/string/Makefile | 1 - src/string/test.h | 20 --------- src/thread/Makefile | 8 ---- src/thread/test.h | 20 --------- src/time/Makefile | 1 - src/time/test.h | 20 --------- 59 files changed, 107 insertions(+), 227 deletions(-) delete mode 100644 src/env/Makefile create mode 100644 src/general/Makefile rename src/{misc => general}/basename.c (100%) rename src/{misc => general}/dirname.c (100%) rename src/{ldso => general}/dlopen.c (81%) rename src/{ldso => general}/dlopen_dso.c (100%) rename src/{env => general}/env.c (100%) rename src/{stdio => general}/fdopen.c (89%) rename src/{regex => general}/fnmatch.c (100%) rename src/{stdio => general}/fscanf.c (100%) rename src/{multibyte => general}/mbc.c (100%) rename src/{stdio => general}/memstream.c (100%) rename src/{stdio => general}/popen.c (100%) rename src/{thread => general}/pthread.c (100%) rename src/{stdlib => general}/qsort.c (100%) rename src/{thread => general}/sem.c (100%) rename src/{stdio => general}/snprintf.c (100%) rename src/{process => general}/spawn.c (100%) rename src/{stdio => general}/sscanf.c (100%) rename src/{stdio => general}/sscanf_long.c (100%) rename src/{string => general}/string.c (100%) create mode 100644 src/general/string_strchr.c create mode 100644 src/general/string_strcspn.c rename src/{stdlib => general}/strtod.c (100%) rename src/{stdlib => general}/strtod_long.c (100%) rename src/{stdlib => general}/strtod_simple.c (100%) rename src/{stdlib => general}/strtof.c (100%) rename src/{stdlib => general}/strtol.c (100%) rename src/{stdlib => general}/strtold.c (100%) rename src/{stdio => general}/swprintf.c (100%) rename src/{env => general}/test.h (100%) rename src/{time => general}/time.c (100%) rename src/{thread => general}/tls_align.c (100%) rename src/{thread => general}/tls_align_dlopen.c (100%) rename src/{thread => general}/tls_align_dso.c (100%) rename src/{thread => general}/tls_init.c (100%) rename src/{stdio => general}/ungetc.c (100%) rename src/{stdlib => general}/wcstol.c (100%) delete mode 100644 src/ldso/Makefile delete mode 100644 src/ldso/test.h delete mode 100644 src/misc/Makefile delete mode 100644 src/misc/test.h delete mode 100644 src/multibyte/Makefile delete mode 100644 src/multibyte/test.h delete mode 100644 src/process/Makefile delete mode 100644 src/process/test.h delete mode 100644 src/regex/Makefile delete mode 100644 src/regex/test.h delete mode 100644 src/stdio/Makefile delete mode 100644 src/stdio/test.h delete mode 100644 src/stdlib/Makefile delete mode 100644 src/stdlib/test.h delete mode 100644 src/string/Makefile delete mode 100644 src/string/test.h delete mode 100644 src/thread/Makefile delete mode 100644 src/thread/test.h delete mode 100644 src/time/Makefile delete mode 100644 src/time/test.h diff --git a/Makefile.inc b/Makefile.inc index 9137e2b..f377844 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,5 +1,5 @@ -CFLAGS+=-g -pipe -std=c99 -D_POSIX_C_SOURCE=200809L -Wall -Wno-unused-function -Wno-missing-braces -LDFLAGS+=-g +CFLAGS+=-pipe -std=c99 -D_POSIX_C_SOURCE=200809L -Wall -Wno-unused-function -Wno-missing-braces +LDFLAGS+= SRC=$(sort $(wildcard *.c)) OBJ=$(SRC:.c=.o) @@ -8,8 +8,7 @@ BINOBJ=$(filter-out %_dso.o,$(OBJ)) DSO=$(DSOOBJ:.o=.so) BIN=$(BINOBJ:.o=) -ROOT=../.. -include $(ROOT)/config.mak +-include ../../config.mak all: $(BIN) $(DSO) run: all diff --git a/src/env/Makefile b/src/env/Makefile deleted file mode 100644 index ee4552b..0000000 --- a/src/env/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.inc diff --git a/src/general/Makefile b/src/general/Makefile new file mode 100644 index 0000000..c6bb180 --- /dev/null +++ b/src/general/Makefile @@ -0,0 +1,8 @@ +include ../../Makefile.inc + +dlopen: LDFLAGS+=-ldl -rdynamic +pthread: LDFLAGS+=-lpthread +sem: LDFLAGS+=-lpthread -lrt +strtod_simple: LDFLAGS+=-lm +tls_align: tls_align_dso.so +tls_align_dlopen: LDFLAGS+=-ldl diff --git a/src/misc/basename.c b/src/general/basename.c similarity index 100% rename from src/misc/basename.c rename to src/general/basename.c diff --git a/src/misc/dirname.c b/src/general/dirname.c similarity index 100% rename from src/misc/dirname.c rename to src/general/dirname.c diff --git a/src/ldso/dlopen.c b/src/general/dlopen.c similarity index 81% rename from src/ldso/dlopen.c rename to src/general/dlopen.c index d3c46f0..38d08f1 100644 --- a/src/ldso/dlopen.c +++ b/src/general/dlopen.c @@ -1,6 +1,8 @@ #include #include "test.h" +int foo; + int main() { void *h, *g; @@ -22,6 +24,9 @@ int main() f(); if (*i != 2) error("f call failed: want i=2 got i=%d\n", *i); + if (dlclose(h)) + error("dlclose failed: %s\n", dlerror()); + g = dlopen(0, RTLD_LAZY|RTLD_LOCAL); if (!g) error("dlopen 0 failed: %s\n", dlerror()); @@ -29,11 +34,16 @@ int main() s = dlerror(); if (i2 || s == 0) error("dlsym i should have failed\n"); + if (dlsym(g, "main") == 0) + error("dlsym main failed: %s\n", dlerror()); + h = dlopen("./dlopen_dso.so", RTLD_LAZY|RTLD_GLOBAL); i2 = dlsym(g, "i"); if (!i2) error("dlsym i failed: %s\n", dlerror()); if (*i2 != 2) error("want i2=2, got i2=%d\n", *i2); + if (dlclose(g)) + error("dlclose failed: %s\n", dlerror()); return test_status; } diff --git a/src/ldso/dlopen_dso.c b/src/general/dlopen_dso.c similarity index 100% rename from src/ldso/dlopen_dso.c rename to src/general/dlopen_dso.c diff --git a/src/env/env.c b/src/general/env.c similarity index 100% rename from src/env/env.c rename to src/general/env.c diff --git a/src/stdio/fdopen.c b/src/general/fdopen.c similarity index 89% rename from src/stdio/fdopen.c rename to src/general/fdopen.c index 98a849f..1f4da03 100644 --- a/src/stdio/fdopen.c +++ b/src/general/fdopen.c @@ -29,7 +29,7 @@ int main(void) TEST(fseeko(f, 0, SEEK_SET)==0); TEST(fgets(foo, sizeof foo, f)); if (strcmp(foo,"hello") != 0) - error("fgets read back wrong message: \"%s\" wanted: \"hello\"\n", foo); + error("fgets read back: \"%s\"; wanted: \"hello\"\n", foo); fclose(f); } if (fd > 2) diff --git a/src/regex/fnmatch.c b/src/general/fnmatch.c similarity index 100% rename from src/regex/fnmatch.c rename to src/general/fnmatch.c diff --git a/src/stdio/fscanf.c b/src/general/fscanf.c similarity index 100% rename from src/stdio/fscanf.c rename to src/general/fscanf.c diff --git a/src/multibyte/mbc.c b/src/general/mbc.c similarity index 100% rename from src/multibyte/mbc.c rename to src/general/mbc.c diff --git a/src/stdio/memstream.c b/src/general/memstream.c similarity index 100% rename from src/stdio/memstream.c rename to src/general/memstream.c diff --git a/src/stdio/popen.c b/src/general/popen.c similarity index 100% rename from src/stdio/popen.c rename to src/general/popen.c diff --git a/src/thread/pthread.c b/src/general/pthread.c similarity index 100% rename from src/thread/pthread.c rename to src/general/pthread.c diff --git a/src/stdlib/qsort.c b/src/general/qsort.c similarity index 100% rename from src/stdlib/qsort.c rename to src/general/qsort.c diff --git a/src/thread/sem.c b/src/general/sem.c similarity index 100% rename from src/thread/sem.c rename to src/general/sem.c diff --git a/src/stdio/snprintf.c b/src/general/snprintf.c similarity index 100% rename from src/stdio/snprintf.c rename to src/general/snprintf.c diff --git a/src/process/spawn.c b/src/general/spawn.c similarity index 100% rename from src/process/spawn.c rename to src/general/spawn.c diff --git a/src/stdio/sscanf.c b/src/general/sscanf.c similarity index 100% rename from src/stdio/sscanf.c rename to src/general/sscanf.c diff --git a/src/stdio/sscanf_long.c b/src/general/sscanf_long.c similarity index 100% rename from src/stdio/sscanf_long.c rename to src/general/sscanf_long.c diff --git a/src/string/string.c b/src/general/string.c similarity index 100% rename from src/string/string.c rename to src/general/string.c diff --git a/src/general/string_strchr.c b/src/general/string_strchr.c new file mode 100644 index 0000000..9ee4ca8 --- /dev/null +++ b/src/general/string_strchr.c @@ -0,0 +1,52 @@ +#include +#include "test.h" + +#define N(s, c) { \ + char *p = s; \ + char *q = strchr(p, c); \ + if (q) \ + error("strchr(%s,%s) returned str+%d, wanted 0\n", #s, #c, q-p); \ +} + +#define T(s, c, n) { \ + char *p = s; \ + char *q = strchr(p, c); \ + if (q == 0) \ + error("strchr(%s,%s) returned 0, wanted str+%d\n", #s, #c, n); \ + else if (q - p != n) \ + error("strchr(%s,%s) returned str+%d, wanted str+%d\n", #s, #c, q-p, n); \ +} + +int main(void) +{ + int i; + char a[128]; + char s[256]; + + for (i = 0; i < 128; i++) + a[i] = (i+1) & 127; + for (i = 0; i < 256; i++) + *((unsigned char*)s+i) = i+1; + + N("", 'a') + N("a", 'b') + N("abc abc", 'x') + N(a, 128) + N(a, 255) + + T("", 0, 0) + T("a", 'a', 0) + T("a", 'a'+256, 0) + T("a", 0, 1) + T("abc abc", 'c', 2) + T(s, 1, 0) + T(s, 2, 1) + T(s, 10, 9) + T(s, 11, 10) + T(s, 127, 126) + T(s, 128, 127) + T(s, 255, 254) + T(s, 0, 255) + + return test_status; +} diff --git a/src/general/string_strcspn.c b/src/general/string_strcspn.c new file mode 100644 index 0000000..39b907e --- /dev/null +++ b/src/general/string_strcspn.c @@ -0,0 +1,33 @@ +#include +#include +#include "test.h" + +#define T(s, c, n) { \ + char *p = s; \ + char *q = c; \ + size_t r = strcspn(p, q); \ + if (r != n) \ + error("strcspn(%s,%s) returned %lu, wanted %lu\n", #s, #c, (unsigned long)r, (unsigned long)(n)); \ +} + +int main(void) +{ + int i; + char a[128]; + char s[256]; + + for (i = 0; i < 128; i++) + a[i] = (i+1) & 127; + for (i = 0; i < 256; i++) + *((unsigned char*)s+i) = i+1; + + T("", "", 0) + T("a", "", 1) + T("", "a", 0) + T("abc", "cde", 2) + T("abc", a, 0) + T("\xff\x80 abc", a, 2) + T(s, "\xff", 254) + + return test_status; +} diff --git a/src/stdlib/strtod.c b/src/general/strtod.c similarity index 100% rename from src/stdlib/strtod.c rename to src/general/strtod.c diff --git a/src/stdlib/strtod_long.c b/src/general/strtod_long.c similarity index 100% rename from src/stdlib/strtod_long.c rename to src/general/strtod_long.c diff --git a/src/stdlib/strtod_simple.c b/src/general/strtod_simple.c similarity index 100% rename from src/stdlib/strtod_simple.c rename to src/general/strtod_simple.c diff --git a/src/stdlib/strtof.c b/src/general/strtof.c similarity index 100% rename from src/stdlib/strtof.c rename to src/general/strtof.c diff --git a/src/stdlib/strtol.c b/src/general/strtol.c similarity index 100% rename from src/stdlib/strtol.c rename to src/general/strtol.c diff --git a/src/stdlib/strtold.c b/src/general/strtold.c similarity index 100% rename from src/stdlib/strtold.c rename to src/general/strtold.c diff --git a/src/stdio/swprintf.c b/src/general/swprintf.c similarity index 100% rename from src/stdio/swprintf.c rename to src/general/swprintf.c diff --git a/src/env/test.h b/src/general/test.h similarity index 100% rename from src/env/test.h rename to src/general/test.h diff --git a/src/time/time.c b/src/general/time.c similarity index 100% rename from src/time/time.c rename to src/general/time.c diff --git a/src/thread/tls_align.c b/src/general/tls_align.c similarity index 100% rename from src/thread/tls_align.c rename to src/general/tls_align.c diff --git a/src/thread/tls_align_dlopen.c b/src/general/tls_align_dlopen.c similarity index 100% rename from src/thread/tls_align_dlopen.c rename to src/general/tls_align_dlopen.c diff --git a/src/thread/tls_align_dso.c b/src/general/tls_align_dso.c similarity index 100% rename from src/thread/tls_align_dso.c rename to src/general/tls_align_dso.c diff --git a/src/thread/tls_init.c b/src/general/tls_init.c similarity index 100% rename from src/thread/tls_init.c rename to src/general/tls_init.c diff --git a/src/stdio/ungetc.c b/src/general/ungetc.c similarity index 100% rename from src/stdio/ungetc.c rename to src/general/ungetc.c diff --git a/src/stdlib/wcstol.c b/src/general/wcstol.c similarity index 100% rename from src/stdlib/wcstol.c rename to src/general/wcstol.c diff --git a/src/ldso/Makefile b/src/ldso/Makefile deleted file mode 100644 index ed7424c..0000000 --- a/src/ldso/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -include ../../Makefile.inc -LDFLAGS+=-ldl - diff --git a/src/ldso/test.h b/src/ldso/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/ldso/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/misc/Makefile b/src/misc/Makefile deleted file mode 100644 index ee4552b..0000000 --- a/src/misc/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.inc diff --git a/src/misc/test.h b/src/misc/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/misc/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/multibyte/Makefile b/src/multibyte/Makefile deleted file mode 100644 index ee4552b..0000000 --- a/src/multibyte/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.inc diff --git a/src/multibyte/test.h b/src/multibyte/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/multibyte/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/process/Makefile b/src/process/Makefile deleted file mode 100644 index ee4552b..0000000 --- a/src/process/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.inc diff --git a/src/process/test.h b/src/process/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/process/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/regex/Makefile b/src/regex/Makefile deleted file mode 100644 index ee4552b..0000000 --- a/src/regex/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.inc diff --git a/src/regex/test.h b/src/regex/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/regex/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/stdio/Makefile b/src/stdio/Makefile deleted file mode 100644 index ee4552b..0000000 --- a/src/stdio/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.inc diff --git a/src/stdio/test.h b/src/stdio/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/stdio/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/stdlib/Makefile b/src/stdlib/Makefile deleted file mode 100644 index e8f62fa..0000000 --- a/src/stdlib/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -include ../../Makefile.inc -strtod_simple: LDFLAGS+=-lm - diff --git a/src/stdlib/test.h b/src/stdlib/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/stdlib/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/string/Makefile b/src/string/Makefile deleted file mode 100644 index ee4552b..0000000 --- a/src/string/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.inc diff --git a/src/string/test.h b/src/string/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/string/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/thread/Makefile b/src/thread/Makefile deleted file mode 100644 index c799ad6..0000000 --- a/src/thread/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -include ../../Makefile.inc -LDFLAGS+=-lpthread - -sem: LDFLAGS += -lrt -tls_align_dlopen: LDFLAGS += -ldl - -tls_align: tls_align_dso.so - diff --git a/src/thread/test.h b/src/thread/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/thread/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - diff --git a/src/time/Makefile b/src/time/Makefile deleted file mode 100644 index ee4552b..0000000 --- a/src/time/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.inc diff --git a/src/time/test.h b/src/time/test.h deleted file mode 100644 index a6a7706..0000000 --- a/src/time/test.h +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#define error(...) test_error(__FILE__, __LINE__, __VA_ARGS__) - -static int test_status; - -static int test_error(const char *n, int l, const char *s, ...) -{ - va_list ap; - - if (test_status == 0) - printf("FAIL\n"); - test_status = 1; - printf(" ERROR %s:%d: ", n, l); - va_start(ap, s); - vprintf(s, ap); - va_end(ap); - return -1; -} - -- 2.20.1