[23701] trunk/base/tests

source_changes at macosforge.org source_changes at macosforge.org
Fri Apr 6 19:44:53 PDT 2007


Revision: 23701
          http://trac.macosforge.org/projects/macports/changeset/23701
Author:   pguyot at kallisys.net
Date:     2007-04-06 19:44:53 -0700 (Fri, 06 Apr 2007)

Log Message:
-----------
New logic to portindex the test tree before tests.
New test for a complex dependency example. This test currently fails and it corresponds to a bug we have with MPlayer. If you install MPlayer +dvdread, it will try to install libdvdread+libdvdcss, but this will not try to install libdvdcss.

Modified Paths:
--------------
    trunk/base/tests/Makefile

Added Paths:
-----------
    trunk/base/tests/test/dependencies-a/
    trunk/base/tests/test/dependencies-a/Portfile
    trunk/base/tests/test/dependencies-b/
    trunk/base/tests/test/dependencies-b/Portfile
    trunk/base/tests/test/dependencies-c/
    trunk/base/tests/test/dependencies-c/Portfile
    trunk/base/tests/test/dependencies-c/master

Modified: trunk/base/tests/Makefile
===================================================================
--- trunk/base/tests/Makefile	2007-04-07 02:32:23 UTC (rev 23700)
+++ trunk/base/tests/Makefile	2007-04-07 02:44:53 UTC (rev 23701)
@@ -1,8 +1,8 @@
 include ../Mk/dports.autoconf.mk
 
-TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace xcodeversion
+TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace xcodeversion dependencies-c
 
-.PHONY: test clean
+.PHONY: test clean PortIndex
 
 all:
 
@@ -13,18 +13,26 @@
 	mkdir -p /tmp/macports-tests/opt/local/etc/ports/
 	mkdir -p /tmp/macports-tests/opt/local/share/
 	mkdir -p /tmp/macports-tests/opt/local/var/db/dports/receipts/
+	mkdir -p /tmp/macports-tests/opt/local/var/db/dports/build/
 	ln -s $(datadir)/darwinports /tmp/macports-tests/opt/local/share/
-	ln -s test /tmp/macports-tests/dports/
+	ln -s $(PWD)/test /tmp/macports-tests/dports/
 	cp sources.conf /tmp/macports-tests/opt/local/etc/ports/
 
+/tmp/macports-tests/dports/PortIndex: /tmp/macports-tests/opt/local/etc/ports/sources.conf PortIndex
+	cp PortIndex /tmp/macports-tests/dports/PortIndex
+
+PortIndex:
+	portindex
+
 clean:
 	rm -rf /tmp/macports-tests/
+	rm -f PortIndex
 
 $(bindir)/port:
 	@echo "Please install macports before running these tests"
 	@exit 1
 	
-test: clean /tmp/macports-tests/opt/local/etc/ports/sources.conf
+test: clean /tmp/macports-tests/dports/PortIndex /tmp/macports-tests/opt/local/etc/ports/sources.conf
 	@for testname in $(TESTS); do\
 	    subdir=test/$$testname; \
 		echo ===\> test ${DIRPRFX}$$subdir; \
@@ -46,6 +54,7 @@
 		fi || exit 1; \
 	done
 	@rm -rf /tmp/macports-tests/
+	@rm -f PortIndex
 
 install:
 

Added: trunk/base/tests/test/dependencies-a/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-a/Portfile	                        (rev 0)
+++ trunk/base/tests/test/dependencies-a/Portfile	2007-04-07 02:44:53 UTC (rev 23701)
@@ -0,0 +1,31 @@
+# $Id$
+
+PortSystem 1.0
+name		dependencies-a
+version		1
+categories	test
+maintainers	pguyot at kallisys.net
+description	Test port for dependencies
+homepage	http://www.macports.org/
+platforms	darwin
+
+long_description ${description}
+
+fetch		{}
+checksum	{}
+extract		{}
+configure	{}
+build		{}
+destroot	{
+	system "touch ${destroot}${prefix}/lib/${name}"
+}
+
+default_variants	+i_want_b
+
+variant i_want_b {
+	depends_lib-append	port:dependencies-b
+}
+
+test {
+# testing consists in processing dependencies
+}


Property changes on: trunk/base/tests/test/dependencies-a/Portfile
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: trunk/base/tests/test/dependencies-b/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-b/Portfile	                        (rev 0)
+++ trunk/base/tests/test/dependencies-b/Portfile	2007-04-07 02:44:53 UTC (rev 23701)
@@ -0,0 +1,25 @@
+# $Id$
+
+PortSystem 1.0
+name		dependencies-b
+version		1
+categories	test
+maintainers	pguyot at kallisys.net
+description	Test port for dependencies
+homepage	http://www.macports.org/
+platforms	darwin
+
+long_description ${description}
+
+fetch		{}
+checksum	{}
+extract		{}
+configure	{}
+build		{}
+destroot	{
+	system "touch ${destroot}${prefix}/lib/${name}"
+}
+
+test {
+# testing consists in processing dependencies
+}


Property changes on: trunk/base/tests/test/dependencies-b/Portfile
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: trunk/base/tests/test/dependencies-c/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-c/Portfile	                        (rev 0)
+++ trunk/base/tests/test/dependencies-c/Portfile	2007-04-07 02:44:53 UTC (rev 23701)
@@ -0,0 +1,31 @@
+# $Id$
+
+PortSystem 1.0
+name		dependencies-c
+version		1
+categories	test
+maintainers	pguyot at kallisys.net
+description	Test port for dependencies
+homepage	http://www.macports.org/
+platforms	darwin
+
+long_description ${description}
+
+fetch		{}
+checksum	{}
+extract		{}
+configure	{}
+build		{}
+destroot	{
+	system "touch ${destroot}${prefix}/lib/${name}"
+}
+
+default_variants	+i_want_a
+
+variant i_want_a {
+	depends_lib-append	port:dependencies-a
+}
+
+test {
+# testing consists in processing dependencies
+}


Property changes on: trunk/base/tests/test/dependencies-c/Portfile
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: trunk/base/tests/test/dependencies-c/master
===================================================================
--- trunk/base/tests/test/dependencies-c/master	                        (rev 0)
+++ trunk/base/tests/test/dependencies-c/master	2007-04-07 02:44:53 UTC (rev 23701)
@@ -0,0 +1,24 @@
+--->  Fetching dependencies-b
+--->  Verifying checksum(s) for dependencies-b
+--->  Extracting dependencies-b
+--->  Configuring dependencies-b
+--->  Building dependencies-b with target all
+--->  Staging dependencies-b into destroot
+--->  Installing dependencies-b 1_0
+--->  Activating dependencies-b 1_0
+--->  Cleaning dependencies-b
+--->  Fetching dependencies-a
+--->  Verifying checksum(s) for dependencies-a
+--->  Extracting dependencies-a
+--->  Configuring dependencies-a
+--->  Building dependencies-a with target all
+--->  Staging dependencies-a into destroot
+--->  Installing dependencies-a 1_0+i_want_b
+--->  Activating dependencies-a 1_0+i_want_b
+--->  Cleaning dependencies-a
+--->  Fetching dependencies-c
+--->  Verifying checksum(s) for dependencies-c
+--->  Extracting dependencies-c
+--->  Configuring dependencies-c
+--->  Building dependencies-c with target all
+--->  Testing dependencies-c

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070406/4b0dd0e4/attachment.html


More information about the macports-changes mailing list