[23700] trunk/base/src
source_changes at macosforge.org
source_changes at macosforge.org
Fri Apr 6 19:32:23 PDT 2007
Revision: 23700
http://trac.macosforge.org/projects/macports/changeset/23700
Author: pguyot at kallisys.net
Date: 2007-04-06 19:32:23 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Process dependencies when executing the test target, just like we do for the destroot phase (this is a workaround for a major design flaw in the dependency engine).
Modified Paths:
--------------
trunk/base/src/darwinports1.0/darwinports.tcl
trunk/base/src/port1.0/porttest.tcl
trunk/base/src/port1.0/portutil.tcl
Modified: trunk/base/src/darwinports1.0/darwinports.tcl
===================================================================
--- trunk/base/src/darwinports1.0/darwinports.tcl 2007-04-07 02:09:22 UTC (rev 23699)
+++ trunk/base/src/darwinports1.0/darwinports.tcl 2007-04-07 02:32:23 UTC (rev 23700)
@@ -980,6 +980,7 @@
set target "pkg"
}
if {$target == "configure" || $target == "build"
+ || $target == "test"
|| $target == "destroot" || $target == "install"
|| $target == "archive"
|| $target == "pkg" || $target == "mpkg"
@@ -1251,13 +1252,14 @@
array set portinfo [dportinfo $dport]
set depends {}
set deptypes {}
-
+
# Determine deptypes to look for based on target
switch $target {
configure { set deptypes "depends_lib" }
build { set deptypes "depends_lib depends_build" }
+ test -
destroot -
install -
archive -
Modified: trunk/base/src/port1.0/porttest.tcl
===================================================================
--- trunk/base/src/port1.0/porttest.tcl 2007-04-07 02:09:22 UTC (rev 23699)
+++ trunk/base/src/port1.0/porttest.tcl 2007-04-07 02:32:23 UTC (rev 23700)
@@ -7,7 +7,7 @@
set com.apple.test [target_new com.apple.test test_main]
target_provides ${com.apple.test} test
-target_requires ${com.apple.test} build
+target_requires ${com.apple.test} main fetch extract checksum patch configure build
target_prerun ${com.apple.test} test_start
# define options
Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl 2007-04-07 02:09:22 UTC (rev 23699)
+++ trunk/base/src/port1.0/portutil.tcl 2007-04-07 02:32:23 UTC (rev 23700)
@@ -871,7 +871,7 @@
eval "proc $name {} $body"
}
-########### Internal Dependancy Manipulation Procedures ###########
+########### Internal Dependency Manipulation Procedures ###########
proc target_run {ditem} {
global target_state_fd portpath portname portversion portrevision portvariants ports_force variations workpath ports_trace PortInfo
@@ -1011,6 +1011,7 @@
build { set deptypes "depends_lib depends_build" }
+ test -
destroot -
install -
archive -
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070406/d11f86a1/attachment.html
More information about the macports-changes
mailing list