diff options
| -rwxr-xr-x | test/criterion.sh | 10 | ||||
| m--------- | test/lib/criterion | 0 | ||||
| -rw-r--r-- | test/src/Makefile | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/test/criterion.sh b/test/criterion.sh index c5c1f04..5ad0756 100755 --- a/test/criterion.sh +++ b/test/criterion.sh @@ -1,12 +1,10 @@ #!/bin/bash -if [ ! -f "lib/criterion/CMakeLists.txt" ]; then - echo "lib/criterion is missing. It is a git submodule from https://github.com/Snaipe/Criterion at a64b860."; +if [ ! -f "lib/criterion/meson.build" ]; then + echo "lib/criterion is missing. It is a git submodule from https://github.com/Snaipe/Criterion at 9c01cbe."; exit 1; fi cd lib/criterion -mkdir -p build -cd build -cmake .. >/dev/null -cmake --build . >/dev/null +meson setup build +meson compile -C build diff --git a/test/lib/criterion b/test/lib/criterion -Subproject a64b8600a9236a4cc8204353b19ce233e294c29 +Subproject 9c01cbe75002ad8640e0f411f453fbcd0567ff7 diff --git a/test/src/Makefile b/test/src/Makefile index c8badc3..6046441 100644 --- a/test/src/Makefile +++ b/test/src/Makefile @@ -11,7 +11,7 @@ TEST ?= 0 ifeq ($(TEST), 1) ECGEN_CFLAGS = --coverage -g -O0 endif -ECGEN_LDFLAGS = -L../../lib/parson -L../../lib/sha1 -L../../lib/pari -L../lib/criterion/build +ECGEN_LDFLAGS = -L../../lib/parson -L../../lib/sha1 -L../../lib/pari -L../lib/criterion/build/src ECGEN_INCLUDES = -I. -I../../src -I../../lib -I../lib/criterion/include ECGEN_LIBS = -lrt -lpari -lpthread -lparson -lsha1 -lcriterion @@ -26,10 +26,10 @@ ECGEN_OBJ = $(patsubst %.c,%.o, $(ECGEN_SRC)) all: unittest unittest: test_ecgen - LD_LIBRARY_PATH=../lib/criterion/build DYLD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1 --filter \!\(brainpool_rfc/test_brainpool_rfc_params\) + LD_LIBRARY_PATH=../lib/criterion/build/src DYLD_LIBRARY_PATH=../lib/criterion/build/src ./test_ecgen --verbose=1 --filter \!\(brainpool_rfc/test_brainpool_rfc_params\) fulltest: test_ecgen - LD_LIBRARY_PATH=../lib/criterion/build DYLD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1 + LD_LIBRARY_PATH=../lib/criterion/build/src DYLD_LIBRARY_PATH=../lib/criterion/build/src ./test_ecgen --verbose=1 test_ecgen: $(TEST_OBJ) $(ECGEN_OBJ) $(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -o) $@ $^ $(ECGEN_LDFLAGS) $(LDFLAGS) $(ECGEN_LIBS) $(LIBS) |