aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-01-01 19:55:13 +0000
committerlloyd <[email protected]>2014-01-01 19:55:13 +0000
commiteb4411a8875c9d70268d57e3a0ee8b5137115296 (patch)
tree6ffbfd7de9e21f88ee919268b00b6c9fc08380b7 /src
parent12be3939752cad5933bbdf67272ec929955cb308 (diff)
Return errors in pubkey tests
Diffstat (limited to 'src')
-rw-r--r--src/build-data/makefile/nmake.in4
-rw-r--r--src/build-data/makefile/unix.in6
-rw-r--r--src/build-data/makefile/unix_shr.in7
3 files changed, 5 insertions, 12 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 1b6a33773..c14a58d1d 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -46,7 +46,7 @@ LIBRARIES = $(BOTAN_LIB)
# This will be either a static lib or the DLL import lib
BOTAN_LIB = $(LIBNAME).%{static_suffix}
-all: $(LIBRARIES)
+all: $(TEST)
### Build Commands
%{lib_build_cmds}
@@ -54,8 +54,6 @@ all: $(LIBRARIES)
%{test_build_cmds}
### Link Commands
-check: $(TEST)
-
$(TEST): $(LIBRARIES) $(TESTOBJS)
$(CXX) /Fe$@ $(TESTOBJS) $(BOTAN_LIB) $(LINK_TO)
diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in
index 4eda9d5c9..1f8eaac2d 100644
--- a/src/build-data/makefile/unix.in
+++ b/src/build-data/makefile/unix.in
@@ -41,15 +41,15 @@ RM = @rm -f
RM_R = @rm -rf
# Targets
+TEST = %{test_prefix}test
LIBRARIES = $(STATIC_LIB)
LIBNAME = %{lib_prefix}libbotan
STATIC_LIB = $(LIBNAME)-$(SERIES).a
-all: $(LIBRARIES)
+all: $(TEST)
# File Lists
-TEST = %{test_prefix}test
HEADERS = %{include_files}
@@ -63,8 +63,6 @@ TESTOBJS = %{test_objs}
%{test_build_cmds}
# Link Commands
-check: $(TEST)
-
$(TEST): $(LIBRARIES) $(TESTOBJS)
$(CXX) $(TESTOBJS) $(STATIC_LIB) $(LINK_TO) -o $(TEST)
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index ea37fb835..986767fcb 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -43,6 +43,7 @@ RM = @rm -f
RM_R = @rm -rf
# Targets
+TEST = %{test_prefix}test
LIBRARIES = $(STATIC_LIB) $(SHARED_LIB)
LIBNAME = %{lib_prefix}libbotan
@@ -53,11 +54,9 @@ SHARED_LIB = $(SONAME).%{version_patch}
SYMLINK = $(LIBNAME)-$(SERIES).%{so_suffix}
-all: $(LIBRARIES)
+all: $(TEST)
# File Lists
-TEST = %{test_prefix}test
-
HEADERS = %{include_files}
LIBOBJS = %{lib_objs}
@@ -70,8 +69,6 @@ TESTOBJS = %{test_objs}
%{test_build_cmds}
# Link Commands
-check: $(TEST)
-
$(TEST): $(LIBRARIES) $(TESTOBJS)
$(CXX) $(LDFLAGS) $(TESTOBJS) $(SHARED_LIB) $(LINK_TO) -lboost_regex -o $(TEST)