[59679] trunk/base
jmr at macports.org
jmr at macports.org
Mon Oct 19 11:31:20 PDT 2009
Revision: 59679
http://trac.macports.org/changeset/59679
Author: jmr at macports.org
Date: 2009-10-19 11:31:18 -0700 (Mon, 19 Oct 2009)
Log Message:
-----------
get most of the tests working again
Modified Paths:
--------------
trunk/base/src/macports1.0/macports.tcl
trunk/base/tests/Makefile
trunk/base/tests/test/case-insensitive-deactivate/Makefile
trunk/base/tests/test/checksums-1/master
trunk/base/tests/test/cvs-and-patchsites/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/trace/master
trunk/base/tests/test/universal-2/master
trunk/base/tests/test/variants/master
trunk/base/tests/test/xcodeversion/master
Added Paths:
-----------
trunk/base/tests/test/dependencies-e/error_expected
Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/src/macports1.0/macports.tcl 2009-10-19 18:31:18 UTC (rev 59679)
@@ -2103,6 +2103,9 @@
array unset portinfo
array set portinfo [lindex $res 1]
if {![info exists portinfo(porturl)]} {
+ if {![macports::ui_isset ports_debug]} {
+ ui_msg ""
+ }
ui_error "Dependency '$dep_portname' not found."
return 1
}
Modified: trunk/base/tests/Makefile
===================================================================
--- trunk/base/tests/Makefile 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/Makefile 2009-10-19 18:31:18 UTC (rev 59679)
@@ -51,7 +51,7 @@
( cd $$subdir && \
PORTSRC=$(PWD)/test-macports.conf $(bindir)/port clean > /dev/null && \
PORTSRC=$(PWD)/test-macports.conf $(bindir)/port test > output 2>&1 \
- || (cat output; exit 1) && \
+ || ([ -e error_expected ] || (cat output; exit 1)) && \
sed -e "s|${PWD}|PWD|g" < output > output.sed && \
diff output.sed master 2>&1 | tee difference && \
if [ -s difference ]; then \
Modified: trunk/base/tests/test/case-insensitive-deactivate/Makefile
===================================================================
--- trunk/base/tests/test/case-insensitive-deactivate/Makefile 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/case-insensitive-deactivate/Makefile 2009-10-19 18:31:18 UTC (rev 59679)
@@ -14,13 +14,13 @@
test:
@echo port install $(TESTPORT1)
@sed 's/@name@/$(TESTPORT1)/' Portfile.in > Portfile
- @PORTSRC=$(PORTSRC) $(bindir)/port -x install > output 2>&1 || (cat output; exit 1)
+ @PORTSRC=$(PORTSRC) $(bindir)/port install > output 2>&1 || (cat output; exit 1)
@if [ ! -f $(TESTFILE) ]; then \
echo "FAILED: File should exist after install: $(TESTFILE)" && exit 1; \
fi
@echo port uninstall $(TESTPORT2)
@sed 's/@name@/$(TESTPORT2)/' Portfile.in > Portfile
- @PORTSRC=$(PORTSRC) $(bindir)/port -x uninstall > output 2>&1 || (cat output; exit 1)
+ @PORTSRC=$(PORTSRC) $(bindir)/port uninstall > output 2>&1 || (cat output; exit 1)
@if [ -f $(TESTFILE) ]; then \
rm $(TESTFILE); \
echo "FAILED: File should NOT exist after uninstall: $(TESTFILE)" && exit 1; \
Modified: trunk/base/tests/test/checksums-1/master
===================================================================
--- trunk/base/tests/test/checksums-1/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/checksums-1/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,3 +1,4 @@
+---> Computing dependencies for checksum
---> Fetching checksum
---> Verifying checksum(s) for checksum
---> Extracting checksum
Modified: trunk/base/tests/test/cvs-and-patchsites/master
===================================================================
--- trunk/base/tests/test/cvs-and-patchsites/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/cvs-and-patchsites/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,3 +1,4 @@
+---> Computing dependencies for cvs-and-patchsites
---> Fetching cvs-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 cvs-and-patchsites
Modified: trunk/base/tests/test/dependencies-c/master
===================================================================
--- trunk/base/tests/test/dependencies-c/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/dependencies-c/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,3 +1,4 @@
+---> Computing dependencies for dependencies-c
---> Fetching dependencies-b
---> Verifying checksum(s) for dependencies-b
---> Extracting dependencies-b
Modified: trunk/base/tests/test/dependencies-d/master
===================================================================
--- trunk/base/tests/test/dependencies-d/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/dependencies-d/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,5 +1,6 @@
Warning: depends option is not handled yet
Warning: depends option is not handled yet
+---> Computing dependencies for dependencies-d
---> Fetching dependencies-b
---> Verifying checksum(s) for dependencies-b
---> Extracting dependencies-b
Modified: trunk/base/tests/test/dependencies-e/master
===================================================================
--- trunk/base/tests/test/dependencies-e/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/dependencies-e/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,2 +1,3 @@
+---> Computing dependencies for dependencies-e
Error: Dependency 'docbook-xml-4.1.2' not found.
Error: Status 1 encountered during processing.
Modified: trunk/base/tests/test/envvariables/master
===================================================================
--- trunk/base/tests/test/envvariables/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/envvariables/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,3 +1,4 @@
+---> Computing dependencies for envvariables
---> Fetching envvariables
---> Verifying checksum(s) for envvariables
---> Extracting envvariables
Modified: trunk/base/tests/test/site-tags/master
===================================================================
--- trunk/base/tests/test/site-tags/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/site-tags/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,3 +1,4 @@
+---> Computing dependencies for site-tags
---> Fetching site-tags
---> Attempting to fetch app-bm.tar.gz from http://www.douglas.stebila.ca/code/vim/app/
---> Attempting to fetch doc.tar.gz from http://www.douglas.stebila.ca/code/vim/doc/
Modified: trunk/base/tests/test/trace/master
===================================================================
--- trunk/base/tests/test/trace/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/trace/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,3 +1,4 @@
+---> Computing dependencies for trace
---> Fetching trace
---> Verifying checksum(s) for trace
---> Extracting trace
Modified: trunk/base/tests/test/universal-2/master
===================================================================
--- trunk/base/tests/test/universal-2/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/universal-2/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,2 +1 @@
-no info for 'variants'
variants:
Modified: trunk/base/tests/test/variants/master
===================================================================
--- trunk/base/tests/test/variants/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/variants/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,5 +1,6 @@
Utopia platform -- 1
-Utopia platform -- 2
+Utopia platform -- 1
+---> Computing dependencies for variants
---> Fetching variants
---> Verifying checksum(s) for variants
---> Extracting variants
Modified: trunk/base/tests/test/xcodeversion/master
===================================================================
--- trunk/base/tests/test/xcodeversion/master 2009-10-19 16:54:02 UTC (rev 59678)
+++ trunk/base/tests/test/xcodeversion/master 2009-10-19 18:31:18 UTC (rev 59679)
@@ -1,3 +1,4 @@
+---> Computing dependencies for xcodeversion
---> Fetching xcodeversion
---> Verifying checksum(s) for xcodeversion
---> Extracting xcodeversion
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091019/baa2b433/attachment.html>
More information about the macports-changes
mailing list