Revision

71039

Author

raimue@macports.org

Date

2010-08-30 07:19:42 -0700 (Mon, 30 Aug 2010)

Log Message

tests: Always run tests from tests/ subdir when executing 'make test'

Modified Paths

• trunk/base/Makefile.in
• trunk/base/tests/Makefile

Diff

--- trunk/base/Makefile.in	2010-08-30 13:58:34 UTC (rev 71038)
+++ trunk/base/Makefile.in	2010-08-30 14:19:42 UTC (rev 71039)
@@ -1,7 +1,7 @@
 # $Id$
 
 PATH		= @PATH_CLEANED@
-SUBDIR		= doc src
+SUBDIR		= doc src tests
 DISTDIR		= dist
 DISTVER		=
 DISTTAG		= release_${subst .,_,${DISTVER}}

--- trunk/base/tests/Makefile	2010-08-30 13:58:34 UTC (rev 71038)
+++ trunk/base/tests/Makefile	2010-08-30 14:19:42 UTC (rev 71039)
@@ -4,9 +4,9 @@
 
 PWD=$(shell pwd)
 
-.PHONY: test clean PortIndex
+.PHONY: all clean install test PortIndex
 
-all:
+all::
 
 /tmp/macports-tests/opt/local/etc/macports/sources.conf: sources.conf
 	@echo setting up test installation
@@ -26,7 +26,7 @@
 PortIndex:
 	$(bindir)/portindex
 
-clean:
+clean::
 	rm -rf /tmp/macports-tests/
 	rm -f PortIndex PortIndex.quick
 	for testname in $(TESTS); do \
@@ -40,7 +40,7 @@
 # Run all tests
 # Use TESTS to choose which tests to run
 # For example: make test TESTS="checkums-1 universal"
-test: clean /tmp/macports-tests/ports/PortIndex /tmp/macports-tests/opt/local/etc/macports/sources.conf
+test:: clean /tmp/macports-tests/ports/PortIndex /tmp/macports-tests/opt/local/etc/macports/sources.conf
 	@for testname in $(TESTS); do\
 	    subdir=test/$$testname; \
 		echo ===\> test ${DIRPRFX}$$subdir; \
@@ -70,6 +70,6 @@
 test-%:
 	$(MAKE) TESTS="$(@:test-%=%)" test
 
-install:
+install::
 
-distclean: clean
+distclean:: clean