[108791] branches/gsoc13-tests/src/port1.0/tests/portactivate.test
cal at macports.org
cal at macports.org
Thu Aug 1 16:16:28 PDT 2013
Revision: 108791
https://trac.macports.org/changeset/108791
Author: cal at macports.org
Date: 2013-08-01 16:16:27 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
portactivate.test: convert tabs to spaces, cleanup
Modified Paths:
--------------
branches/gsoc13-tests/src/port1.0/tests/portactivate.test
Modified: branches/gsoc13-tests/src/port1.0/tests/portactivate.test
===================================================================
--- branches/gsoc13-tests/src/port1.0/tests/portactivate.test 2013-08-01 23:12:19 UTC (rev 108790)
+++ branches/gsoc13-tests/src/port1.0/tests/portactivate.test 2013-08-01 23:16:27 UTC (rev 108791)
@@ -161,26 +161,26 @@
set mport [mportopen file://.]
proc getportbuildpath {id {portname ""}} {
- global portdbpath
- regsub {://} $id {.} port_path
- regsub -all {/} $port_path {_} port_path
- return [file join $portdbpath build $port_path $portname]
+ global portdbpath
+ regsub {://} $id {.} port_path
+ regsub -all {/} $port_path {_} port_path
+ return [file join $portdbpath build $port_path $portname]
}
proc getportworkpath_from_buildpath {portbuildpath} {
- return [file join $portbuildpath work]
+ return [file join $portbuildpath work]
}
proc getportworkpath_from_portdir {portpath {portname ""}} {
- return [getportworkpath_from_buildpath [getportbuildpath $portpath $portname]]
+ return [getportworkpath_from_buildpath [getportbuildpath $portpath $portname]]
}
source $pwd/../portmain.tcl
# sets up PortInfo array
if {[eval_variants variations] != 0} {
- mportclose $mport
- error "Error evaluating variants"
+ mportclose $mport
+ error "Error evaluating variants"
}
# set $version var
@@ -191,7 +191,7 @@
# portinstall setup
interp alias {} _cd {} cd
- set macosx_deployment_target $pwd/deploy_target
+ set macosx_deployment_target ""
file mkdir $pwd/$subport
file link -symbolic $pwd/$subport/work $pwd/work
@@ -199,21 +199,16 @@
return "FAIL: cannot install port"
}
- set res [catch {portdeactivate::deactivate_main}]
- puts $res
- #if {[catch {portdeactivate::deactivate_main}] != 0} {
- # return "FAIL: cannot deactivate port"
- #}
-
+ if {[catch {portdeactivate::deactivate_main}] != 0} {
+ return "FAIL: cannot deactivate port"
+ }
} -body {
- puts ###
- puts [catch {portactivate::activate_main}]
-
+ return [catch {portactivate::activate_main}]
} -cleanup {
set res [uninstall_main]
file delete -force $pwd/$subport/work
file delete -force $pwd/$subport
-} -result ""
+} -result 0
cleanupTests
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130801/177d2f55/attachment.html>
More information about the macports-changes
mailing list