[79489] trunk/base/tests
jmr at macports.org
jmr at macports.org
Wed Jun 15 13:31:28 PDT 2011
Revision: 79489
http://trac.macports.org/changeset/79489
Author: jmr at macports.org
Date: 2011-06-15 13:31:28 -0700 (Wed, 15 Jun 2011)
Log Message:
-----------
test fixes
Modified Paths:
--------------
trunk/base/tests/Makefile
trunk/base/tests/test/case-insensitive-deactivate/Makefile
trunk/base/tests/test/case-insensitive-deactivate/Portfile.in
trunk/base/tests/test/checksums-1/master
trunk/base/tests/test/dependencies-a/Portfile
trunk/base/tests/test/dependencies-b/Portfile
trunk/base/tests/test/dependencies-c/Portfile
trunk/base/tests/test/dependencies-c/master
trunk/base/tests/test/dependencies-d/Portfile
trunk/base/tests/test/dependencies-e/Portfile
trunk/base/tests/test/dependencies-e/master
trunk/base/tests/test/envvariables/Portfile
trunk/base/tests/test/envvariables/master
trunk/base/tests/test/site-tags/Portfile
trunk/base/tests/test/site-tags/master
trunk/base/tests/test/trace/Portfile
trunk/base/tests/test/trace/master
trunk/base/tests/test/universal/Portfile
trunk/base/tests/test/universal-2/Portfile
trunk/base/tests/test/variants/Portfile
trunk/base/tests/test/variants/master
trunk/base/tests/test/xcodeversion/Portfile
trunk/base/tests/test/xcodeversion/master
Modified: trunk/base/tests/Makefile
===================================================================
--- trunk/base/tests/Makefile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/Makefile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -47,7 +47,7 @@
for testname in $(TESTS); do\
subdir=test/$$testname; \
echo ===\> test ${DIRPRFX}$$subdir; \
- if [ -e ${DIRPRFX}$$subdir/Makefile ]; then \
+ if [ -e $$subdir/Makefile ]; then \
( cd $$subdir && \
$(MAKE) DIRPRFX=${DIRPRFX}$$subdir/ PORTSRC=$(PWD)/test-macports.conf test) && \
success=$$(( success + 1 )); \
Modified: trunk/base/tests/test/case-insensitive-deactivate/Makefile
===================================================================
--- trunk/base/tests/test/case-insensitive-deactivate/Makefile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/case-insensitive-deactivate/Makefile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,7 +1,7 @@
include ../../../Mk/macports.autoconf.mk
# see test-macports.conf for the value of prefix
-TESTFILE=/tmp/macports-tests/opt/local/var/macports/case
+TESTFILE=/tmp/macports-tests/opt/local/var/test/case
TESTPORT1=casesensitive
TESTPORT2=CaseSensitivE
Modified: trunk/base/tests/test/case-insensitive-deactivate/Portfile.in
===================================================================
--- trunk/base/tests/test/case-insensitive-deactivate/Portfile.in 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/case-insensitive-deactivate/Portfile.in 2011-06-15 20:31:28 UTC (rev 79489)
@@ -12,11 +12,10 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
- system "touch ${destroot}${prefix}/var/macports/case"
+ xinstall -d ${destroot}${prefix}/var/test
+ system "touch ${destroot}${prefix}/var/test/case"
}
Modified: trunk/base/tests/test/checksums-1/master
===================================================================
--- trunk/base/tests/test/checksums-1/master 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/checksums-1/master 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,4 +1,3 @@
----> Computing dependencies for checksum
---> Fetching checksum
---> Verifying checksum(s) for checksum
---> Extracting checksum
Modified: trunk/base/tests/test/dependencies-a/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-a/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/dependencies-a/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,10 +11,8 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
Modified: trunk/base/tests/test/dependencies-b/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-b/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/dependencies-b/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,10 +11,8 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
Modified: trunk/base/tests/test/dependencies-c/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-c/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/dependencies-c/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,10 +11,8 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
Modified: trunk/base/tests/test/dependencies-c/master
===================================================================
--- trunk/base/tests/test/dependencies-c/master 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/dependencies-c/master 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,4 +1,6 @@
---> Computing dependencies for dependencies-c
+---> Dependencies to be installed: dependencies-a dependencies-b
+---> Fetching archive for dependencies-b
---> Fetching dependencies-b
---> Verifying checksum(s) for dependencies-b
---> Extracting dependencies-b
@@ -8,6 +10,7 @@
---> Installing dependencies-b @1_0
---> Activating dependencies-b @1_0
---> Cleaning dependencies-b
+---> Fetching archive for dependencies-a
---> Fetching dependencies-a
---> Verifying checksum(s) for dependencies-a
---> Extracting dependencies-a
Modified: trunk/base/tests/test/dependencies-d/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-d/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/dependencies-d/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,10 +11,8 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
Modified: trunk/base/tests/test/dependencies-e/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-e/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/dependencies-e/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,10 +11,8 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
Modified: trunk/base/tests/test/dependencies-e/master
===================================================================
--- trunk/base/tests/test/dependencies-e/master 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/dependencies-e/master 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,3 +1,4 @@
---> 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>
Modified: trunk/base/tests/test/envvariables/Portfile
===================================================================
--- trunk/base/tests/test/envvariables/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/envvariables/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,10 +11,8 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
Modified: trunk/base/tests/test/envvariables/master
===================================================================
--- trunk/base/tests/test/envvariables/master 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/envvariables/master 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,4 +1,3 @@
----> Computing dependencies for envvariables
---> Fetching envvariables
---> Verifying checksum(s) for envvariables
---> Extracting envvariables
Modified: trunk/base/tests/test/site-tags/Portfile
===================================================================
--- trunk/base/tests/test/site-tags/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/site-tags/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -26,7 +26,7 @@
rmd160 3cbae7e39e8c78eca03a0db709cf520003896a12
extract {}
-configure {}
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
Modified: trunk/base/tests/test/site-tags/master
===================================================================
--- trunk/base/tests/test/site-tags/master 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/site-tags/master 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,4 +1,3 @@
----> Computing dependencies for site-tags
---> Fetching 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/
Modified: trunk/base/tests/test/trace/Portfile
===================================================================
--- trunk/base/tests/test/trace/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/trace/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,10 +11,8 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
Modified: trunk/base/tests/test/trace/master
===================================================================
--- trunk/base/tests/test/trace/master 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/trace/master 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,4 +1,3 @@
----> Computing dependencies for trace
---> Fetching trace
---> Verifying checksum(s) for trace
---> Extracting trace
Modified: trunk/base/tests/test/universal/Portfile
===================================================================
--- trunk/base/tests/test/universal/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/universal/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,9 +11,7 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
+distfiles
configure {}
build {}
destroot {
Modified: trunk/base/tests/test/universal-2/Portfile
===================================================================
--- trunk/base/tests/test/universal-2/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/universal-2/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,9 +11,7 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
+distfiles
configure {}
build {}
destroot {
Modified: trunk/base/tests/test/variants/Portfile
===================================================================
--- trunk/base/tests/test/variants/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/variants/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,10 +11,8 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
@@ -24,8 +22,6 @@
# test is actually installing this.
}
-use_configure no
-
# We override universal variant.
variant universal {
puts "Universal Variant"
Modified: trunk/base/tests/test/variants/master
===================================================================
--- trunk/base/tests/test/variants/master 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/variants/master 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,6 +1,5 @@
Utopia variant -- 2
Utopia variant -- 2
----> Computing dependencies for variants
---> Fetching variants
---> Verifying checksum(s) for variants
---> Extracting variants
Modified: trunk/base/tests/test/xcodeversion/Portfile
===================================================================
--- trunk/base/tests/test/xcodeversion/Portfile 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/xcodeversion/Portfile 2011-06-15 20:31:28 UTC (rev 79489)
@@ -11,16 +11,18 @@
long_description ${description}
-fetch {}
-checksum {}
-extract {}
-configure {}
+distfiles
+use_configure no
build {}
destroot {
system "touch ${destroot}${prefix}/lib/${name}"
}
test {
- ui_msg "xcodeversion = $xcodeversion"
+ if {$xcodeversion != "" && [rpm-vercomp $xcodeversion 2.1] >= 0} {
+ ui_msg "xcodeversion >= 2.1"
+ } else {
+ ui_msg "xcodeversion = $xcodeversion"
+ }
ui_msg "xcodebuildcmd = $xcodebuildcmd"
}
Modified: trunk/base/tests/test/xcodeversion/master
===================================================================
--- trunk/base/tests/test/xcodeversion/master 2011-06-15 20:23:35 UTC (rev 79488)
+++ trunk/base/tests/test/xcodeversion/master 2011-06-15 20:31:28 UTC (rev 79489)
@@ -1,9 +1,8 @@
----> Computing dependencies for xcodeversion
---> Fetching xcodeversion
---> Verifying checksum(s) for xcodeversion
---> Extracting xcodeversion
---> Configuring xcodeversion
---> Building xcodeversion
---> Testing xcodeversion
-xcodeversion = 2.1
-xcodebuildcmd = xcodebuild
+xcodeversion >= 2.1
+xcodebuildcmd = /usr/bin/xcodebuild
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110615/43fcf235/attachment-0001.html>
More information about the macports-changes
mailing list