Merge branch 'testing' of git://github.com/nmathewson/timeout into nmathewson-testing

Makefile

@@ -2,7 +2,7 @@ CPPFLAGS = -DTIMEOUT_DEBUG
 CFLAGS = -O2 -march=native -g -Wall -Wextra -Wno-unused-parameter
 LUA = lua
 
-all: bench.so bench-wheel.so bench-heap.so bench-llrb.so
+all: bench.so bench-wheel.so bench-heap.so bench-llrb.so test-timeout
 
 WHEEL_BIT = 6
 WHEEL_NUM = 4
@@ -28,6 +28,8 @@ timeout.o: timeout.c
 bench: bench.c timeout.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< -ldl
 
+test-timeout: timeout.o test-timeout.o
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ timeout.o test-timeout.o
 
 ifeq ($(shell uname -s), Darwin)
 SOFLAGS = -bundle -undefined dynamic_lookup