Revision
37271
Author
raimue@macports.org
Date
2008-06-01 17:06:59 -0700 (Sun, 01 Jun 2008)

Log Message

tests/test/universal{,-2}:
Use port info --variants to check for the variant instead of the whole info
output. Should be more error prone if we make further changes.

Modified Paths

Diff

Modified: trunk/base/tests/test/universal/Makefile (37270 => 37271)


--- trunk/base/tests/test/universal/Makefile	2008-06-02 00:05:20 UTC (rev 37270)
+++ trunk/base/tests/test/universal/Makefile	2008-06-02 00:06:59 UTC (rev 37271)
@@ -8,7 +8,7 @@
 
 test:
 	@PORTSRC=$(PORTSRC) $(bindir)/port clean > /dev/null
-	@sh -c "export PORTSRC=$(PORTSRC); $(bindir)/port info" > output 2>&1 || (cat output; exit 1)
+	@sh -c "export PORTSRC=$(PORTSRC); $(bindir)/port info --variants" > output 2>&1 || (cat output; exit 1)
 	@diff output master 2>&1 | tee difference
 	@if [ -s difference ]; then \
 		exit 1; \

Modified: trunk/base/tests/test/universal/master (37270 => 37271)


--- trunk/base/tests/test/universal/master	2008-06-02 00:05:20 UTC (rev 37270)
+++ trunk/base/tests/test/universal/master	2008-06-02 00:06:59 UTC (rev 37271)
@@ -1,7 +1 @@
-universal 1, test/universal (Variants: universal)
-http://www.macports.org/
-
-{Test port for universal variant}
-
-Platforms: darwin
-Maintainers: pguyot@kallisys.net
+variants: universal

Modified: trunk/base/tests/test/universal-2/Makefile (37270 => 37271)


--- trunk/base/tests/test/universal-2/Makefile	2008-06-02 00:05:20 UTC (rev 37270)
+++ trunk/base/tests/test/universal-2/Makefile	2008-06-02 00:06:59 UTC (rev 37271)
@@ -8,7 +8,7 @@
 
 test:
 	@PORTSRC=$(PORTSRC) $(bindir)/port clean > /dev/null
-	@sh -c "export PORTSRC=$(PORTSRC); $(bindir)/port info" > output 2>&1 || (cat output; exit 1)
+	@sh -c "export PORTSRC=$(PORTSRC); $(bindir)/port info --variants" > output 2>&1 || (cat output; exit 1)
 	@diff output master 2>&1 | tee difference
 	@if [ -s difference ]; then \
 		exit 1; \

Modified: trunk/base/tests/test/universal-2/master (37270 => 37271)


--- trunk/base/tests/test/universal-2/master	2008-06-02 00:05:20 UTC (rev 37270)
+++ trunk/base/tests/test/universal-2/master	2008-06-02 00:06:59 UTC (rev 37271)
@@ -1,7 +1,2 @@
-universal-2 1, test/universal-2
-http://www.macports.org/
-
-{Test port for universal variant}
-
-Platforms: darwin
-Maintainers: pguyot@kallisys.net
+no info for 'variants'
+variants: