[92405] branches/release_2_1
jmr at macports.org
jmr at macports.org
Fri Apr 27 13:46:37 PDT 2012
Revision: 92405
https://trac.macports.org/changeset/92405
Author: jmr at macports.org
Date: 2012-04-27 13:46:37 -0700 (Fri, 27 Apr 2012)
Log Message:
-----------
merge r92404 from trunk:
clean up installed ports between tests, and update expected test output
Revision Links:
--------------
https://trac.macports.org/changeset/92404
Modified Paths:
--------------
branches/release_2_1/base/tests/Makefile
branches/release_2_1/base/tests/test/checksums-1/master
branches/release_2_1/base/tests/test/dependencies-c/master
branches/release_2_1/base/tests/test/dependencies-d/master
branches/release_2_1/base/tests/test/dependencies-e/master
branches/release_2_1/base/tests/test/envvariables/master
branches/release_2_1/base/tests/test/site-tags/master
branches/release_2_1/base/tests/test/svn-and-patchsites/master
branches/release_2_1/base/tests/test/trace/master
branches/release_2_1/base/tests/test/variants/master
branches/release_2_1/base/tests/test/xcodeversion/master
Property Changed:
----------------
branches/release_2_1/
branches/release_2_1/base/
Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:91825,91829,91834,92072,92342
+ /trunk:91825,91829,91834,92072,92342,92404
Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/release_2_1/base/tests/Makefile
===================================================================
--- branches/release_2_1/base/tests/Makefile 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/Makefile 2012-04-27 20:46:37 UTC (rev 92405)
@@ -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: branches/release_2_1/base/tests/test/checksums-1/master
===================================================================
--- branches/release_2_1/base/tests/test/checksums-1/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/checksums-1/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -1,4 +1,4 @@
----> Fetching checksum
+---> Fetching distfiles for checksum
---> Verifying checksum(s) for checksum
---> Extracting checksum
---> Configuring checksum
Modified: branches/release_2_1/base/tests/test/dependencies-c/master
===================================================================
--- branches/release_2_1/base/tests/test/dependencies-c/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/dependencies-c/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -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: branches/release_2_1/base/tests/test/dependencies-d/master
===================================================================
--- branches/release_2_1/base/tests/test/dependencies-d/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/dependencies-d/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -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: branches/release_2_1/base/tests/test/dependencies-e/master
===================================================================
--- branches/release_2_1/base/tests/test/dependencies-e/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/dependencies-e/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -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: branches/release_2_1/base/tests/test/envvariables/master
===================================================================
--- branches/release_2_1/base/tests/test/envvariables/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/envvariables/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -1,4 +1,4 @@
----> Fetching envvariables
+---> Fetching distfiles for envvariables
---> Verifying checksum(s) for envvariables
---> Extracting envvariables
---> Configuring envvariables
Modified: branches/release_2_1/base/tests/test/site-tags/master
===================================================================
--- branches/release_2_1/base/tests/test/site-tags/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/site-tags/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -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: branches/release_2_1/base/tests/test/svn-and-patchsites/master
===================================================================
--- branches/release_2_1/base/tests/test/svn-and-patchsites/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/svn-and-patchsites/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -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: branches/release_2_1/base/tests/test/trace/master
===================================================================
--- branches/release_2_1/base/tests/test/trace/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/trace/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -1,4 +1,4 @@
----> Fetching trace
+---> Fetching distfiles for trace
---> Verifying checksum(s) for trace
---> Extracting trace
---> Configuring trace
Modified: branches/release_2_1/base/tests/test/variants/master
===================================================================
--- branches/release_2_1/base/tests/test/variants/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/variants/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -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: branches/release_2_1/base/tests/test/xcodeversion/master
===================================================================
--- branches/release_2_1/base/tests/test/xcodeversion/master 2012-04-27 20:43:29 UTC (rev 92404)
+++ branches/release_2_1/base/tests/test/xcodeversion/master 2012-04-27 20:46:37 UTC (rev 92405)
@@ -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/0d962968/attachment-0001.html>
More information about the macports-changes
mailing list