Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...

[libeap.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index b40ff1c..210a1b4 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 TESTS=test-base64 test-md4 test-md5 test-milenage test-ms_funcs test-sha1 \
-       test-sha256 test-aes test-asn1 test-x509
+       test-sha256 test-aes test-asn1 test-x509 test-x509v3 test-list
 
 all: $(TESTS)
 
@@ -18,10 +18,14 @@ endif
 CFLAGS += -I../src
 CFLAGS += -I../src/utils
 
-LIBS = ../src/utils/libutils.a \
-       ../src/crypto/libcrypto.a \
+SLIBS = ../src/utils/libutils.a
+
+DLIBS = ../src/crypto/libcrypto.a \
        ../src/tls/libtls.a
 
+LIBS = $(SLIBS) $(DLIBS)
+LLIBS = -Wl,--start-group $(DLIBS) -Wl,--end-group $(SLIBS)
+
 ../src/utils/libutils.a:
        $(MAKE) -C ../src/utils
 
@@ -41,6 +45,9 @@ test-asn1: test-asn1.o $(LIBS)
 test-base64: test-base64.o $(LIBS)
        $(LDO) $(LDFLAGS) -o $@ $^
 
+test-list: test-list.o $(LIBS)
+       $(LDO) $(LDFLAGS) -o $@ $^
+
 test-md4: test-md4.o $(LIBS)
        $(LDO) $(LDFLAGS) -o $@ $^
 
@@ -60,11 +67,15 @@ test-sha256: test-sha256.o $(LIBS)
        $(LDO) $(LDFLAGS) -o $@ $^
 
 test-x509: test-x509.o $(LIBS)
-       $(LDO) $(LDFLAGS) -o $@ $^
+       $(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
+
+test-x509v3: test-x509v3.o $(LIBS)
+       $(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
 
 
 run-tests: $(TESTS)
        ./test-aes
+       ./test-list
        ./test-md4
        ./test-md5
        ./test-milenage
@@ -76,5 +87,7 @@ run-tests: $(TESTS)
 clean:
        $(MAKE) -C ../src clean
        rm -f $(TESTS) *~ *.o *.d
+       rm -f test_x509v3_nist.out.*
+       rm -f test_x509v3_nist2.out.*
 
 -include $(OBJS:%.o=%.d)