[23549] trunk/base/tests

[source_changes at macosforge.org]

Revision: 23549
          http://trac.macosforge.org/projects/macports/changeset/23549
Author:   pguyot at kallisys.net
Date:     2007-04-04 01:58:32 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
Moved all tests to test/, so I'll be able to portindex them.

Modified Paths:
--------------
    trunk/base/tests/Makefile
    trunk/base/tests/test-ports.conf

Added Paths:
-----------
    trunk/base/tests/test/
    trunk/base/tests/test/checksums-1/
    trunk/base/tests/test/cvs-and-patchsites/
    trunk/base/tests/test/site-tags/
    trunk/base/tests/test/trace/
    trunk/base/tests/test/xcodeversion/

Removed Paths:
-------------
    trunk/base/tests/checksums-1/
    trunk/base/tests/cvs-and-patchsites/
    trunk/base/tests/site-tags/
    trunk/base/tests/trace/
    trunk/base/tests/xcodeversion/

Modified: trunk/base/tests/Makefile
===================================================================
--- trunk/base/tests/Makefile	2007-04-04 08:46:14 UTC (rev 23548)
+++ trunk/base/tests/Makefile	2007-04-04 08:58:32 UTC (rev 23549)
@@ -6,24 +6,25 @@
 
 all:
 
-/tmp/darwinports-tests/opt/local/etc/ports/sources.conf: sources.conf
+/tmp/macports-tests/opt/local/etc/ports/sources.conf: sources.conf
 	@echo setting up test installation
-	rm -rf /tmp/darwinports-tests/
-	mkdir -p /tmp/darwinports-tests/opt/local/etc/ports/
-	mkdir -p /tmp/darwinports-tests/opt/local/share/
-	mkdir -p /tmp/darwinports-tests/opt/local/var/db/dports/receipts/
-	ln -s $(datadir)/darwinports /tmp/darwinports-tests/opt/local/share/
-	cp sources.conf /tmp/darwinports-tests/opt/local/etc/ports/
+	rm -rf /tmp/macports-tests/
+	mkdir -p /tmp/macports-tests/opt/local/etc/ports/
+	mkdir -p /tmp/macports-tests/opt/local/share/
+	mkdir -p /tmp/macports-tests/opt/local/var/db/dports/receipts/
+	ln -s $(datadir)/darwinports /tmp/macports-tests/opt/local/share/
+	cp sources.conf /tmp/macports-tests/opt/local/etc/ports/
 
 clean:
-	rm -rf /tmp/darwinports-tests/
+	rm -rf /tmp/macports-tests/
 
 $(bindir)/port:
-	@echo "Please install DarwinPorts before running these tests"
+	@echo "Please install macports before running these tests"
 	@exit 1
 	
-test: clean /tmp/darwinports-tests/opt/local/etc/ports/sources.conf
-	@for subdir in $(TESTS); do\
+test: clean /tmp/macports-tests/opt/local/etc/ports/sources.conf
+	@for testname in $(TESTS); do\
+	    subdir=test/$$testname; \
 		echo ===\> test ${DIRPRFX}$$subdir; \
 		if [ -e ${DIRPRFX}$$subdir/Makefile ]; then \
 			( cd $$subdir && \
@@ -42,7 +43,7 @@
 			fi) \
 		fi || exit 1; \
 	done
-	@rm -rf /tmp/darwinports-tests/
+	@rm -rf /tmp/macports-tests/
 
 install:
 

Copied: trunk/base/tests/test/checksums-1 (from rev 23438, trunk/base/tests/checksums-1)

Copied: trunk/base/tests/test/cvs-and-patchsites (from rev 23438, trunk/base/tests/cvs-and-patchsites)

Copied: trunk/base/tests/test/site-tags (from rev 23438, trunk/base/tests/site-tags)

Copied: trunk/base/tests/test/trace (from rev 23438, trunk/base/tests/trace)

Copied: trunk/base/tests/test/xcodeversion (from rev 23438, trunk/base/tests/xcodeversion)

Modified: trunk/base/tests/test-ports.conf
===================================================================
--- trunk/base/tests/test-ports.conf	2007-04-04 08:46:14 UTC (rev 23548)
+++ trunk/base/tests/test-ports.conf	2007-04-04 08:58:32 UTC (rev 23549)
@@ -1,8 +1,8 @@
 # Set the directory in which to install ports
-prefix			/tmp/darwinports-tests/opt/local
+prefix			/tmp/macports-tests/opt/local
 
 # Where to store ports specific database files
-portdbpath		/tmp/darwinports-tests/opt/local/var/db/dports
+portdbpath		/tmp/macports-tests/opt/local/var/db/dports
 
 # Type of storage to use for the port registry information, "flat" or "sqlite"
 # NOTE: sqlite not yet supported.
@@ -12,10 +12,10 @@
 portinstalltype		image
 
 # Directory containing the X11 installation.
-x11prefix		/tmp/darwinports-tests/usr/X11R6
+x11prefix		/tmp/macports-tests/usr/X11R6
 
 # Where to find the sources list.
-sources_conf		/tmp/darwinports-tests/opt/local/etc/ports/sources.conf
+sources_conf		/tmp/macports-tests/opt/local/etc/ports/sources.conf
 
 # Where to find global variants definition file (optional)
 #variants_conf		/opt/local/etc/ports/variants.conf
@@ -24,7 +24,7 @@
 portarchivemode		yes
 
 # Where to store/retrieve ports binary archive files
-portarchivepath		/tmp/darwinports-tests/opt/local/var/db/dports/packages
+portarchivepath		/tmp/macports-tests/opt/local/var/db/dports/packages
 
 # Type of binary archive packages to create when using archive mode
 #

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070404/35b24324/attachment.html