[92404] trunk/base/tests

jmr at macports.org jmr at macports.org
Fri Apr 27 13:43:30 PDT 2012


Revision: 92404
          https://trac.macports.org/changeset/92404
Author:   jmr at macports.org
Date:     2012-04-27 13:43:29 -0700 (Fri, 27 Apr 2012)
Log Message:
-----------
clean up installed ports between tests, and update expected test output

Modified Paths:
--------------
    trunk/base/tests/Makefile
    trunk/base/tests/test/checksums-1/master
    trunk/base/tests/test/dependencies-c/master
    trunk/base/tests/test/dependencies-d/master
    trunk/base/tests/test/dependencies-e/master
    trunk/base/tests/test/envvariables/master
    trunk/base/tests/test/site-tags/master
    trunk/base/tests/test/svn-and-patchsites/master
    trunk/base/tests/test/trace/master
    trunk/base/tests/test/variants/master
    trunk/base/tests/test/xcodeversion/master

Modified: trunk/base/tests/Makefile
===================================================================
--- trunk/base/tests/Makefile	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/Makefile	2012-04-27 20:43:29 UTC (rev 92404)
@@ -64,6 +64,10 @@
 				rm -f difference output.sed; \
 			fi) && \
 			success=$$(( success + 1 )); \
+			if [ -n "`PORTSRC=$(PWD)/test-macports.conf $(bindir)/port -q echo installed`" ]; then \
+			    PORTSRC=$(PWD)/test-macports.conf $(bindir)/port -f clean --all installed > /dev/null && \
+			    PORTSRC=$(PWD)/test-macports.conf $(bindir)/port -f uninstall installed > /dev/null; \
+			fi; \
 		fi; \
 		num=$$(( num + 1 )); \
 	done; \

Modified: trunk/base/tests/test/checksums-1/master
===================================================================
--- trunk/base/tests/test/checksums-1/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/checksums-1/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,4 +1,4 @@
---->  Fetching checksum
+--->  Fetching distfiles for checksum
 --->  Verifying checksum(s) for checksum
 --->  Extracting checksum
 --->  Configuring checksum

Modified: trunk/base/tests/test/dependencies-c/master
===================================================================
--- trunk/base/tests/test/dependencies-c/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/dependencies-c/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,7 +1,6 @@
 --->  Computing dependencies for dependencies-c
 --->  Dependencies to be installed: dependencies-a dependencies-b
---->  Fetching archive for dependencies-b
---->  Fetching dependencies-b
+--->  Fetching distfiles for dependencies-b
 --->  Verifying checksum(s) for dependencies-b
 --->  Extracting dependencies-b
 --->  Configuring dependencies-b
@@ -10,8 +9,7 @@
 --->  Installing dependencies-b @1_0
 --->  Activating dependencies-b @1_0
 --->  Cleaning dependencies-b
---->  Fetching archive for dependencies-a
---->  Fetching dependencies-a
+--->  Fetching distfiles for dependencies-a
 --->  Verifying checksum(s) for dependencies-a
 --->  Extracting dependencies-a
 --->  Configuring dependencies-a
@@ -20,7 +18,7 @@
 --->  Installing dependencies-a @1_0+i_want_b
 --->  Activating dependencies-a @1_0+i_want_b
 --->  Cleaning dependencies-a
---->  Fetching dependencies-c
+--->  Fetching distfiles for dependencies-c
 --->  Verifying checksum(s) for dependencies-c
 --->  Extracting dependencies-c
 --->  Configuring dependencies-c

Modified: trunk/base/tests/test/dependencies-d/master
===================================================================
--- trunk/base/tests/test/dependencies-d/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/dependencies-d/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,7 +1,8 @@
 Warning: depends option is not handled yet
 Warning: depends option is not handled yet
 --->  Computing dependencies for dependencies-d
---->  Fetching dependencies-b
+--->  Dependencies to be installed: dependencies-a dependencies-b
+--->  Fetching distfiles for dependencies-b
 --->  Verifying checksum(s) for dependencies-b
 --->  Extracting dependencies-b
 --->  Configuring dependencies-b
@@ -10,7 +11,7 @@
 --->  Installing dependencies-b @1_0
 --->  Activating dependencies-b @1_0
 --->  Cleaning dependencies-b
---->  Fetching dependencies-a
+--->  Fetching distfiles for dependencies-a
 --->  Verifying checksum(s) for dependencies-a
 --->  Extracting dependencies-a
 --->  Configuring dependencies-a
@@ -19,7 +20,7 @@
 --->  Installing dependencies-a @1_0+i_want_b
 --->  Activating dependencies-a @1_0+i_want_b
 --->  Cleaning dependencies-a
---->  Fetching dependencies-d
+--->  Fetching distfiles for dependencies-d
 --->  Verifying checksum(s) for dependencies-d
 --->  Extracting dependencies-d
 --->  Configuring dependencies-d

Modified: trunk/base/tests/test/dependencies-e/master
===================================================================
--- trunk/base/tests/test/dependencies-e/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/dependencies-e/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,4 +1,5 @@
 --->  Computing dependencies for dependencies-e
 Error: Dependency 'docbook-xml-4.1.2' not found.
-Error: Status 1 encountered during processing.
-To report a bug, see <http://guide.macports.org/#project.tickets>
+To report a bug, follow the instructions in the guide:
+    http://guide.macports.org/#project.tickets
+Error: Processing of port dependencies-e failed

Modified: trunk/base/tests/test/envvariables/master
===================================================================
--- trunk/base/tests/test/envvariables/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/envvariables/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,4 +1,4 @@
---->  Fetching envvariables
+--->  Fetching distfiles for envvariables
 --->  Verifying checksum(s) for envvariables
 --->  Extracting envvariables
 --->  Configuring envvariables

Modified: trunk/base/tests/test/site-tags/master
===================================================================
--- trunk/base/tests/test/site-tags/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/site-tags/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,4 +1,4 @@
---->  Fetching site-tags
+--->  Fetching distfiles for site-tags
 --->  Attempting to fetch app-bm.tar.gz from http://www.douglas.stebila.ca/files/code/vim/app/
 --->  Attempting to fetch doc.tar.gz from http://www.douglas.stebila.ca/files/code/vim/doc/
 --->  Verifying checksum(s) for site-tags

Modified: trunk/base/tests/test/svn-and-patchsites/master
===================================================================
--- trunk/base/tests/test/svn-and-patchsites/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/svn-and-patchsites/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,4 +1,4 @@
---->  Fetching svn-and-patchsites
+--->  Fetching distfiles for svn-and-patchsites
 --->  Attempting to fetch patch-1.5.14.dgc.xlabel_ext.9 from http://home.uchicago.edu/~dgc/sw/mutt/
 --->  Verifying checksum(s) for svn-and-patchsites
 --->  Extracting svn-and-patchsites

Modified: trunk/base/tests/test/trace/master
===================================================================
--- trunk/base/tests/test/trace/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/trace/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,4 +1,4 @@
---->  Fetching trace
+--->  Fetching distfiles for trace
 --->  Verifying checksum(s) for trace
 --->  Extracting trace
 --->  Configuring trace

Modified: trunk/base/tests/test/variants/master
===================================================================
--- trunk/base/tests/test/variants/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/variants/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,6 +1,6 @@
 Utopia variant -- 2
 Utopia variant -- 2
---->  Fetching variants
+--->  Fetching distfiles for variants
 --->  Verifying checksum(s) for variants
 --->  Extracting variants
 --->  Configuring variants

Modified: trunk/base/tests/test/xcodeversion/master
===================================================================
--- trunk/base/tests/test/xcodeversion/master	2012-04-27 20:04:47 UTC (rev 92403)
+++ trunk/base/tests/test/xcodeversion/master	2012-04-27 20:43:29 UTC (rev 92404)
@@ -1,4 +1,4 @@
---->  Fetching xcodeversion
+--->  Fetching distfiles for xcodeversion
 --->  Verifying checksum(s) for xcodeversion
 --->  Extracting xcodeversion
 --->  Configuring xcodeversion
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120427/e5d78e38/attachment.html>


More information about the macports-changes mailing list