diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-03-13 09:21:01 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-03-13 22:41:40 +0000 |
| commit | f074647d2b6b16af34a2a9595adffd78c3a2dfe3 (patch) | |
| tree | 89e929cb7e60a9dd4b9fe8dfa17a43f89b72fe73 /epan/wmem | |
| parent | 8f9e543d4ec168ba3f85bc37ba6236d08c910a53 (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/wmem')
| -rw-r--r-- | epan/wmem/Makefile.am | 2 | ||||
| -rw-r--r-- | epan/wmem/Makefile.nmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am index 0d05311792..8fd4960e79 100644 --- a/epan/wmem/Makefile.am +++ b/epan/wmem/Makefile.am @@ -36,6 +36,8 @@ wmem_test_LDADD = \ libwmem.la \ $(GLIB_LIBS) +test-programs: wmem_test + CLEANFILES = \ libwmem.a \ libwmem.la \ diff --git a/epan/wmem/Makefile.nmake b/epan/wmem/Makefile.nmake index 2adc57b7c0..1378be6860 100644 --- a/epan/wmem/Makefile.nmake +++ b/epan/wmem/Makefile.nmake @@ -37,9 +37,11 @@ wmem_test.exe: $(WMEM_TEST_OBJ) $(WMEM_TEST_LIBS) link /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(WMEM_TEST_LIBS) $(GLIB_LIBS) $(WMEM_TEST_OBJ) -wmem_test_install: +wmem_test_install: wmem_test.exe set copycmd=/y - if exist wmem_test.exe xcopy wmem_test.exe ..\..\$(INSTALL_DIR) /d + xcopy wmem_test.exe ..\..\$(INSTALL_DIR) /d + +test-programs: wmem_test_install checkapi: $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ |