about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-11-11 23:26:37 -0500
committerJune McEnroe <june@causal.agency>2019-11-11 23:26:37 -0500
commitb8b70183117139597c90e1d3f397b17a1a292501 (patch)
treee6e91f3d5af52aa20d7a20ae34fe68ee1bfd0b80
parentTest getopt_config (diff)
downloadpounce-b8b70183117139597c90e1d3f397b17a1a292501.tar.gz
pounce-b8b70183117139597c90e1d3f397b17a1a292501.zip
Revert "Test getopt_config"
This reverts commit c8a771828e1d5fc8c476bbd650fafcfb7ba390a8.

It just feels gross... idk.
-rw-r--r--.gitignore2
-rw-r--r--Makefile13
-rw-r--r--config.c47
3 files changed, 1 insertions, 61 deletions
diff --git a/.gitignore b/.gitignore
index 8af4cb8..c7ce8fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
 *.conf
 *.o
-*.t
 /calico
 /pounce
 config.mk
 localhost.crt
 localhost.key
 tags
-test
diff --git a/Makefile b/Makefile
index d8f8504..c0ea331 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,7 @@ OBJS += ring.o
 OBJS += server.o
 OBJS += state.o
 
-TESTS += config.t
-
-dev: tags all test
+dev: tags all
 
 all: ${BINS}
 
@@ -39,15 +37,6 @@ ${OBJS}: bounce.h compat.h
 
 dispatch.o: compat.h
 
-test: ${TESTS}
-	set -e; ${TESTS:%=./%;}
-	touch test
-
-.SUFFIXES: .t
-
-.c.t:
-	${CC} ${CFLAGS} -DTEST ${LDFLAGS} $< ${LDLIBS} -o $@
-
 tags: *.c *.h
 	ctags -w *.c *.h
 
diff --git a/config.c b/config.c
index befb1fc..653ae16 100644
--- a/config.c
+++ b/config.c
@@ -136,50 +136,3 @@ int getopt_config(
 		file = NULL;
 	}
 }
-
-#ifdef TEST
-#include <assert.h>
-#include <sysexits.h>
-
-static const struct option LongOpts[] = {
-	{ "foo", no_argument, NULL, 'f' },
-	{ "bar", required_argument, NULL, 'b' },
-	{0},
-};
-
-static char Test[] = {
-	"\n"
-	WS "\n"
-	"#foo\n"
-	WS "#foo\n"
-	"foo\n"
-	WS "foo\n"
-	"foo" WS "\n"
-	"bar=baz\n"
-	"bar" WS "=baz\n"
-	"bar=" WS "baz\n"
-	"bar" WS "=" WS "baz\n"
-	"bar = # baz \n"
-	"foo"
-};
-
-int main(void) {
-	int argc = 1;
-	char *argv[] = { "test", NULL };
-	file = fmemopen(Test, sizeof(Test) - 1, "r");
-	if (!file) err(EX_OSERR, "fmemopen");
-
-	for (int i = 0; i < 3; ++i) {
-		assert('f' == getopt_config(argc, argv, "", LongOpts, NULL));
-	}
-	for (int i = 0; i < 4; ++i) {
-		assert('b' == getopt_config(argc, argv, "", LongOpts, NULL));
-		assert(!strcmp("baz", optarg));
-	}
-	assert('b' == getopt_config(argc, argv, "", LongOpts, NULL));
-	assert(!strcmp("# baz ", optarg));
-	assert('f' == getopt_config(argc, argv, "", LongOpts, NULL));
-	assert(-1 == getopt_config(argc, argv, "", LongOpts, NULL));
-}
-
-#endif