[111371] trunk/base
jmr at macports.org
jmr at macports.org
Thu Sep 19 10:04:32 PDT 2013
Revision: 111371
https://trac.macports.org/changeset/111371
Author: jmr at macports.org
Date: 2013-09-19 10:04:32 -0700 (Thu, 19 Sep 2013)
Log Message:
-----------
use file dirname instead of reimplementing it
Modified Paths:
--------------
trunk/base/src/macports1.0/tests/macports.test
trunk/base/src/package1.0/tests/portarchivefetch.test
trunk/base/src/package1.0/tests/portdmg.test
trunk/base/src/package1.0/tests/portdpkg.test
trunk/base/src/package1.0/tests/portmdmg.test
trunk/base/src/package1.0/tests/portmpkg.test
trunk/base/src/package1.0/tests/portpkg.test
trunk/base/src/port1.0/tests/portactivate.test
trunk/base/src/port1.0/tests/portchecksum.test
trunk/base/src/port1.0/tests/portclean.test
trunk/base/src/port1.0/tests/portdeactivate.test
trunk/base/src/port1.0/tests/portdepends.test
trunk/base/src/port1.0/tests/portdistcheck.test
trunk/base/src/port1.0/tests/portinstall.test
trunk/base/src/port1.0/tests/portload.test
trunk/base/src/port1.0/tests/portmain.test
trunk/base/src/port1.0/tests/portpatch.test
trunk/base/src/port1.0/tests/porttest.test
trunk/base/src/port1.0/tests/portuninstall.test
trunk/base/src/port1.0/tests/portutil.test
trunk/base/tests/test/library.tcl
Modified: trunk/base/src/macports1.0/tests/macports.test
===================================================================
--- trunk/base/src/macports1.0/tests/macports.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/macports1.0/tests/macports.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -2,8 +2,7 @@
namespace import tcltest::*
eval ::tcltest::configure $::argv
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../macports_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/package1.0/tests/portarchivefetch.test
===================================================================
--- trunk/base/src/package1.0/tests/portarchivefetch.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/package1.0/tests/portarchivefetch.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../package_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/package1.0/tests/portdmg.test
===================================================================
--- trunk/base/src/package1.0/tests/portdmg.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/package1.0/tests/portdmg.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../package_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/package1.0/tests/portdpkg.test
===================================================================
--- trunk/base/src/package1.0/tests/portdpkg.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/package1.0/tests/portdpkg.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../package_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/package1.0/tests/portmdmg.test
===================================================================
--- trunk/base/src/package1.0/tests/portmdmg.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/package1.0/tests/portmdmg.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../package_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/package1.0/tests/portmpkg.test
===================================================================
--- trunk/base/src/package1.0/tests/portmpkg.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/package1.0/tests/portmpkg.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../package_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/package1.0/tests/portpkg.test
===================================================================
--- trunk/base/src/package1.0/tests/portpkg.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/package1.0/tests/portpkg.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../package_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portactivate.test
===================================================================
--- trunk/base/src/port1.0/tests/portactivate.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portactivate.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portchecksum.test
===================================================================
--- trunk/base/src/port1.0/tests/portchecksum.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portchecksum.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
package require macports 1.0
mportinit
Modified: trunk/base/src/port1.0/tests/portclean.test
===================================================================
--- trunk/base/src/port1.0/tests/portclean.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portclean.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portdeactivate.test
===================================================================
--- trunk/base/src/port1.0/tests/portdeactivate.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portdeactivate.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portdepends.test
===================================================================
--- trunk/base/src/port1.0/tests/portdepends.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portdepends.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portdistcheck.test
===================================================================
--- trunk/base/src/port1.0/tests/portdistcheck.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portdistcheck.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portinstall.test
===================================================================
--- trunk/base/src/port1.0/tests/portinstall.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portinstall.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portload.test
===================================================================
--- trunk/base/src/port1.0/tests/portload.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portload.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portmain.test
===================================================================
--- trunk/base/src/port1.0/tests/portmain.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portmain.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portpatch.test
===================================================================
--- trunk/base/src/port1.0/tests/portpatch.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portpatch.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/porttest.test
===================================================================
--- trunk/base/src/port1.0/tests/porttest.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/porttest.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portuninstall.test
===================================================================
--- trunk/base/src/port1.0/tests/portuninstall.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portuninstall.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -1,8 +1,7 @@
package require tcltest 2
namespace import tcltest::*
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/src/port1.0/tests/portutil.test
===================================================================
--- trunk/base/src/port1.0/tests/portutil.test 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/src/port1.0/tests/portutil.test 2013-09-19 17:04:32 UTC (rev 111371)
@@ -3,8 +3,7 @@
source ../../macports1.0/macports_fastload.tcl
-set pwd [file normalize $argv0]
-set pwd [eval file join {*}[lrange [file split $pwd] 0 end-1]]
+set pwd [file dirname [file normalize $argv0]]
source ../port_test_autoconf.tcl
source $macports::autoconf::macports_tcl_dir/macports1.0/macports_fastload.tcl
Modified: trunk/base/tests/test/library.tcl
===================================================================
--- trunk/base/tests/test/library.tcl 2013-09-19 16:41:04 UTC (rev 111370)
+++ trunk/base/tests/test/library.tcl 2013-09-19 17:04:32 UTC (rev 111371)
@@ -20,7 +20,7 @@
exit 1
}
- set cpwd [eval file join {*}[lrange [file split $pwd] 0 end-2]]
+ set cpwd [file dirname [file dirname $pwd]]
set line [get_line $autoconf "prefix*"]
set prefix [lrange [split $line " "] 1 1]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130919/a1444598/attachment-0001.html>
More information about the macports-changes
mailing list