aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-03-13 09:21:01 -0700
committerGerald Combs <gerald@wireshark.org>2015-03-13 22:41:40 +0000
commitf074647d2b6b16af34a2a9595adffd78c3a2dfe3 (patch)
tree89e929cb7e60a9dd4b9fe8dfa17a43f89b72fe73 /epan/Makefile.nmake
parent8f9e543d4ec168ba3f85bc37ba6236d08c910a53 (diff)
Add a test-programs target everywhere.
Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r--epan/Makefile.nmake20
1 files changed, 12 insertions, 8 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index f0ad957250..cdb804d2fe 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -360,22 +360,26 @@ reassemble_test.exe: $(REASSEMBLE_TEST_OBJ)
mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
!ENDIF
-exntest_install:
+exntest_install: exntest.exe
set copycmd=/y
- if exist exntest.exe xcopy exntest.exe ..\$(INSTALL_DIR) /d
+ xcopy exntest.exe ..\$(INSTALL_DIR) /d
-tvbtest_install:
+tvbtest_install: tvbtest.exe
set copycmd=/y
- if exist tvbtest.exe xcopy tvbtest.exe ..\$(INSTALL_DIR) /d
+ xcopy tvbtest.exe ..\$(INSTALL_DIR) /d
-oids_test_install:
+oids_test_install: oids_test.exe
set copycmd=/y
- if exist oids_test.exe xcopy oids_test.exe ..\$(INSTALL_DIR) /d
+ xcopy oids_test.exe ..\$(INSTALL_DIR) /d
-reassemble_test_install:
+reassemble_test_install: reassemble_test.exe
set copycmd=/y
- if exist reassemble_test.exe xcopy reassemble_test.exe ..\$(INSTALL_DIR) /d
+ xcopy reassemble_test.exe ..\$(INSTALL_DIR) /d
+test-programs: exntest_install tvbtest_install oids_test_install reassemble_test_install
+ cd wmem
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake test-programs
+ cd ..
#
# Compile some time critical code from assembler if NASM available