aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Hawthorn <john.hawthorn@gmail.com>2012-03-18 17:26:54 -0700
committerJohn Hawthorn <john.hawthorn@gmail.com>2012-03-18 17:26:54 -0700
commitf3f8d7f3003d522007bcbeba55d200cccc691b58 (patch)
tree65b1efdb03969949dff2a9335a7e92d9803fc91d
parent74a3fd2430abc1129ecb7663e2a4914336b26501 (diff)
parentfe733cabf146c5321f2c9372ec4d006392238018 (diff)
downloadmirror-meh-f3f8d7f3003d522007bcbeba55d200cccc691b58.tar.gz
mirror-meh-f3f8d7f3003d522007bcbeba55d200cccc691b58.tar.bz2
mirror-meh-f3f8d7f3003d522007bcbeba55d200cccc691b58.zip
Merge pull request #4 from rtandy/tests
make tests build again, again
-rw-r--r--.gitignore1
-rw-r--r--Makefile2
-rw-r--r--test/test.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9340b4d..147db68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
*.o
*.d
meh
+test/test
diff --git a/Makefile b/Makefile
index 4455b14..0e3a5dd 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ meh: $(OBJFILES)
test: $(TESTTARGET)
./$(TESTTARGET)
-test/test: test/test.o $(filter-out src/main.o, $(OBJFILES))
+test/test: test/test.o $(filter-out src/main.o src/xlib.o, $(OBJFILES))
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-include $(DEPFILES)
diff --git a/test/test.c b/test/test.c
index 926d5c2..82e450b 100644
--- a/test/test.c
+++ b/test/test.c
@@ -3,6 +3,7 @@
#include "sys/time.h"
#include "../src/meh.h"
+#include "../src/scale.h"
#define TESTRUNS 20
#define STARTTEST(name) int test_##name(){ testname = #name; testsrun++; do