From 306e622a61b7a8735ad889089636ec4df5aadcf0 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Tue, 1 Sep 2009 10:58:32 -0700 Subject: [PATCH] Make run-unit-tests _always_ make libunittest.a. --- tests/ChangeLog | 5 +++++ tests/Makefile.am | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index f5e4f348..6e2b41a4 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2009-09-01 Micah Cowan + + * Makefile.am (../src/libunittest.a): Make it a phony target, + so we always make sure to get up-to-date unit-test runs. + 2009-08-27 Micah Cowan * WgetTest.pm.in (run): Shift the errcode right by 8 binary places. diff --git a/tests/Makefile.am b/tests/Makefile.am index ca2f3502..0c3fed4e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,6 +42,8 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests ../src/wget$(EXEEXT): cd ../src && $(MAKE) $(AM_MAKEFLAGS) +# Make libunittest "PHONY" so we're always sure we're up-to-date. +.PHONY: ../src/libunittest.a ../src/libunittest.a: cd ../src && $(MAKE) $(AM_MAKEFLAGS) libunittest.a @@ -51,7 +53,7 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests ../md5/libmd5.a: cd ../lib && $(MAKE) $(AM_MAKEFLAGS) -run-unit-tests: unit-tests$(EXEEXT) +run-unit-tests: unit-tests$(EXEEXT) ../src/libunittest.a ./unit-tests$(EXEEXT) run-px-tests: WgetTest.pm ../src/wget$(EXEEXT) @@ -117,9 +119,9 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ run-px certs check_PROGRAMS = unit-tests -unit_tests_SOURCES = -#unit-tests: ../src/libunittest.a ../lib/libgnu.a +unit_tests_SOURCES = +unit-tests: ../src/libunittest.a LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \ - @MD5_LDADD@ + @MD5_LDADD@ CLEANFILES = *~ *.bak core core.[0-9]* -- 2.39.2