[118582] trunk/base
jmr at macports.org
jmr at macports.org
Fri Apr 4 23:49:20 PDT 2014
Revision: 118582
https://trac.macports.org/changeset/118582
Author: jmr at macports.org
Date: 2014-04-04 23:49:20 -0700 (Fri, 04 Apr 2014)
Log Message:
-----------
use self-hosted (and smaller) archives for tests involving downloads, plus various other test fixes
Modified Paths:
--------------
trunk/base/src/macports1.0/tests/Portfile
trunk/base/src/macports1.0/tests/macports.test
trunk/base/src/macports1.0/tests/macports_dlist.test
trunk/base/src/package1.0/tests/portarchivefetch.test
trunk/base/src/port1.0/tests/Portfile
trunk/base/src/port1.0/tests/portdistcheck.test
trunk/base/src/port1.0/tests/portinstall.test
trunk/base/src/port1.0/tests/portpatch.test
trunk/base/src/port1.0/tests/portuninstall.test
trunk/base/tests/test/library.tcl
trunk/base/tests/test/statefile-unknown-version/test.tcl
trunk/base/tests/test/statefile-version1/test.tcl
trunk/base/tests/test/statefile-version1-outdated/test.tcl
trunk/base/tests/test/statefile-version2/test.tcl
trunk/base/tests/test/statefile-version2-invalid/test.tcl
trunk/base/tests/test/statefile-version2-outdated/test.tcl
Modified: trunk/base/src/macports1.0/tests/Portfile
===================================================================
--- trunk/base/src/macports1.0/tests/Portfile 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/macports1.0/tests/Portfile 2014-04-05 06:49:20 UTC (rev 118582)
@@ -1,40 +1,30 @@
-# $Id: Portfile 85472 2011-10-14 01:52:18Z dports at macports.org $
+# $Id$
-PortSystem 1.0
+PortSystem 1.0
-name fondu
-version 060102
-revision 1
-platforms darwin
-categories print
-license BSD
-maintainers nomaintainer
-homepage http://fondu.sourceforge.net/
-master_sites http://fondu.sourceforge.net/
+name gcc_select
+version 0.1
+revision 4
+categories sysutils
+platforms darwin
+license BSD
+maintainers mww
+supported_archs noarch
+description Switch the default compiler
+long_description gcc_select lets you switch the default compiler. \
+ It symlinks the standard compiler executables \
+ in the MacPorts prefix to the selected version.
-description A set of programs to interconvert between Mac font \
- formats and pfb, ttf, otf and bdf files on UNIX.
+homepage http://svn.macports.org/repository/macports/contrib/select/
+master_sites ${homepage}
+distname select-${version}
+checksums sha1 18e1f95c2ddd88210aa52eb696261859af2dc3a4
-long_description Dealing with Mac fonts is hard on other operating \
- systems because Mac fonts are stored in the resource \
- fork, and other operating systems do not support \
- this concept. Fondu will extract the resource fork \
- from either a MacBinary file or a BinHex file. Ufond \
- will create a resource fork inside a MacBinary file.
+configure.args --mandir=${prefix}/share/man --name=gcc
-checksums md5 e20861beacddc1ab392bef7813641bf8
-extract.suffix .tgz
-distfiles ${name}_src-${version}${extract.suffix}
-
-post-patch {
- reinplace "s|^CFLAGS = -g \$(WFLAGS)|CFLAGS = -g \$(WFLAGS) ${configure.cppflags} ${configure.cflags} ${configure.ldflags} [get_canonical_archflags]|g" ${worksrcpath}/Makefile.in
-}
-
-configure.args --bindir=${prefix}/bin \
- --mandir=${prefix}/share/man
-
post-destroot {
- eval xinstall -m 644 [glob ${worksrcpath}/*.1] ${destroot}${prefix}/share/man/man1/
+ xinstall -d ${destroot}${prefix}/etc/select/gcc
+ touch ${destroot}${prefix}/etc/select/gcc/base
}
-test.run yes
+livecheck.type none
Modified: trunk/base/src/macports1.0/tests/macports.test
===================================================================
--- trunk/base/src/macports1.0/tests/macports.test 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/macports1.0/tests/macports.test 2014-04-05 06:49:20 UTC (rev 118582)
@@ -34,20 +34,14 @@
#set ui_options(ports_verbose) yes
mportinit ui_options
-package require portutil 1.0
-package require portinstall 1.0
-package require portuninstall 1.0
package require Thread
-source ../../registry2.0/portuninstall.tcl
-source ../../port1.0/port_autoconf.tcl
source ./library.tcl
-macports_worker_init
test mportclose {
Mport close unit test.
} -setup {
- set mport [mportopen file://.]
+ set mport [mportopen file://${pwd}]
} -body {
if {[catch {mportclose $mport}] != 0} {
return "FAIL: cannot run mportclose"
@@ -62,12 +56,13 @@
test mportinfo {
- Mport info uni test.
+ Mport info unit test.
} -setup {
- set mport [mportopen file://.]
+ set mport [mportopen file://${pwd}]
} -body {
set res [mportinfo $mport]
- if {[lindex $res 2] != "canonical_active_variants"} {
+ catch {array set PortInfo $res}
+ if {![info exists PortInfo(canonical_active_variants)]} {
return "FAIL: cannot get ::PortInfo"
}
return "Mport info successful."
@@ -76,101 +71,56 @@
} -result "Mport info successful."
-test mportopen_installed {
- Mport installed unit test.
-} -constraints {
- root
+test worker_init {
+ Worker init unit test.
} -setup {
- set os.platform darwin
- set macosx_version 10.8
- set os.major 10
- set os_version 11
- set os_arch i386
-
- set supported_archs {}
- set configure.build_arch build_arch
- set portarchivetype tgz
-
- set destpath $pwd/work/destroot
- set portdbpath $pwd/portdbpath
- set workpath $pwd/fondu/work
- set portpath $pwd
-
- set subport fondu
- set version 3.0
- set revision 1
- set epoch i386
-
- file copy -force $pwd/Portfile /tmp/
- 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]
+ set name [interp create]
+ set portpath $pwd/portpath
+ set porturl http://www.macports.org
+ set portbuildpath $pwd/build
+ set options {a b}
+ set variations {1 2}
+} -body {
+ macports::worker_init $name $portpath $porturl $portbuildpath $options $variations
+ if {$name ne "interp0"} {
+ return "FAIL: wrong workername"
}
-
- proc getportworkpath_from_buildpath {portbuildpath} {
- return [file join $portbuildpath work]
+ if {[catch {$name eval source Portfile} result]} {
+ return "FAIL: cannot load Portfile"
}
-
- proc getportworkpath_from_portdir {portpath {portname ""}} {
- return [getportworkpath_from_buildpath [getportbuildpath $portpath $portname]]
+ if {[$name eval findBinary ls] ne "/bin/ls"} {
+ return "FAIL: alias not created"
}
-
- source $pwd/../../port1.0/portmain.tcl
-
- # sets up PortInfo array
- if {[eval_variants variations] != 0} {
- mportclose $mport
- error "Error evaluating variants"
+ if {[$name eval return \$os_arch] ne $macports::os_arch} {
+ return "FAIL: var not set"
}
+ return "Worker init successful."
+} -result "Worker init successful."
- # set $version var
- set workername [ditem_key $mport workername]
- # run destroot
- $workername eval eval_targets destroot
-
- # portinstall setup
- interp alias {} _cd {} cd
- set macosx_deployment_target $pwd/deploy_target
- file mkdir $pwd/$subport
- file link -symbolic $pwd/$subport/work $pwd/work
-
- if {[catch {portinstall::install_main}] != 0} {
- return "FAIL: cannot install port"
- }
-
- set variants {}
- set options {}
-
+test init_logging {
+ Init logging unit test.
+} -constraints {
+ root
+} -setup {
+ set mport [mportopen file://${pwd}]
} -body {
- set res [mportopen_installed $subport $version $revision $variants $options]
- if {![string match "ditem_*" $res]} {
- return "FAIL: installed port not opened"
+ if {[macports::init_logging $mport] != 0} {
+ return "FAIL: incorrect channels"
}
-
- if {[catch {mportclose $res}] != 0} {
- return "FAIL: cannot close port"
+ if {$macports::channels(any) != "stdout debuglog"} {
+ return "FAIL: incorrect channels(any)"
}
- if {[catch {mportclose $res}] != 1} {
- return "FAIL: installed port not closed"
+ if {(![info exists ui_options(ports_debug)] && $macports::channels(debug) ne "debuglog") ||
+ ([info exists ui_options(ports_debug)] && $macports::channels(debug) ne "stderr debuglog")} {
+ return "FAIL: incorrect channels(debug)"
}
- return "Installed port open successful."
-
+ return "Init logging successful."
} -cleanup {
- if {[catch {portuninstall::uninstall_main}] != 0} {
- return "FAIL: cannot install port"
- }
mportclose $mport
+} -result "Init logging successful."
- file delete -force $pwd/work
- file delete -force $pwd/$subport
-} -result "Installed port open successful."
-
test ui_isset {
Ui is set unit test.
} -body {
@@ -203,34 +153,12 @@
} -result "Global option isset successful."
-test init_logging {
- Init logging unit test.
-} -constraints {
- root
-} -setup {
- set mport [mportopen file://.]
-} -body {
- if {[macports::init_logging $mport] != 0} {
- return "FAIL: incorrect channels"
- }
- if {$macports::channels(any) != "stdout debuglog"} {
- return "FAIL: incorrect channels(any)"
- }
- if {$macports::channels(debug) != "debuglog"} {
- return "FAIL: incorrect channels(debug)"
- }
- return "Init logging successful."
-} -cleanup {
- mportclose $mport
-} -result "Init logging successful."
-
-
test ch_logging {
Channel logging unit test. Assumes main.log filename.
} -constraints {
root
} -setup {
- set mport [mportopen file://.]
+ set mport [mportopen file://${pwd}]
set portname [_mportkey $mport subport]
set portpath [_mportkey $mport portpath]
@@ -259,7 +187,7 @@
} -constraints {
root
} -setup {
- set mport [mportopen file://.]
+ set mport [mportopen file://${pwd}]
set ::logenabled 1
} -body {
if {[catch {macports::push_log $mport}] != 0} {
@@ -280,7 +208,7 @@
set ::logenabled 1
set ::logstack [open $pwd/logstack w+]
set ::debuglog [open $pwd/log w+]
- set mport [mportopen file://.]
+ set mport [mportopen file://${pwd}]
if {[catch {macports::push_log $mport}] != 0} {
return "FAIL: cannot push log"
}
@@ -504,6 +432,54 @@
# test mportinit
+test mportopen_installed {
+ Mport installed unit test.
+} -constraints {
+ root
+} -setup {
+ set subport gcc_select
+ set version 0.1
+ set revision 4
+
+ set mport [mportopen file://${pwd}]
+
+ # run destroot
+ mportexec $mport destroot
+
+ if {[catch {mportexec $mport activate}] != 0} {
+ ui_debug "$::errorInfo"
+ return "FAIL: cannot install port"
+ }
+
+ set variants {}
+ set options {}
+
+} -body {
+ set res [mportopen_installed $subport $version $revision $variants $options]
+ if {![string match "ditem_*" $res]} {
+ return "FAIL: installed port not opened"
+ }
+
+ if {[catch {mportclose $res}] != 0} {
+ return "FAIL: cannot close port"
+ }
+ if {[catch {mportclose $res}] != 1} {
+ return "FAIL: installed port not closed"
+ }
+ return "Installed port open successful."
+
+} -cleanup {
+ if {[catch {mportexec $mport uninstall}] != 0} {
+ return "FAIL: cannot uninstall port"
+ }
+ mportclose $mport
+
+ file delete -force $pwd/work
+ file delete -force $pwd/$subport
+ cd $pwd
+} -result "Installed port open successful."
+
+
test mportshutdown {
Mport shutdown unit test.
} -setup {
@@ -557,33 +533,6 @@
} -result "Copy xcode plist successful."
-test worker_init {
- Worker init unit test.
-} -setup {
- set name [interp create]
- set portpath $pwd/portpath
- set porturl http://www.macports.org
- set portbuildpath $pwd/build
- set options {a b}
- set variations {1 2}
-} -body {
- macports::worker_init $name $portpath $porturl $portbuildpath $options $variations
- if {$name != "interp0"} {
- return "FAIL: wrong workername"
- }
- if {[$name eval source Portfile] != "yes"} {
- return "FAIL: cannot load Portfile"
- }
- if {[$name eval findBinary ls] != "/bin/ls"} {
- return "FAIL: alias not created"
- }
- if {[$name eval return \$os_arch] != "i386"} {
- return "FAIL: var not set"
- }
- return "Worker init successful."
-} -result "Worker init successful."
-
-
test create_thread {
Create thread unit test.
} -body {
@@ -614,9 +563,9 @@
test fetch_port {
Fetch port unit test.
} -body {
- set url http://packages.macports.org/fondu/fondu-060102_1.darwin_10.x86_64.tbz2
+ set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
set res [macports::fetch_port $url]
- if {$res != "${pwd}/portdbpath/portdirs/fondu-060102_1"} {
+ if {$res != "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
return "FAIL: cannot fetch port"
}
return "Fetch port successful."
@@ -640,9 +589,9 @@
} -setup {
close [open $pwd/local_file w+]
} -body {
- set url http://fondu.sourceforge.net/fondu_src-060102.tgz
+ set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
set res [macports::getportdir $url]
- if {$res != "${pwd}/portdbpath/portdirs/fondu_src-060102"} {
+ if {$res != "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
return "FAIL: invalid port directory"
}
@@ -661,9 +610,9 @@
Get port resource path. Doesn't check for 'file' protocol.
} -body {
set macports::portdbpath $pwd/portdbpath
- set url "http://packages.macports.org/fondu/fondu-060102_1.darwin_12.x86_64.tbz2"
+ set url "http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2"
set default_path $pwd/portdbpath/sources/rsync.macports.org/release/tarballs/ports/_resources
- set fallback_path $pwd/portdbpath/sources/packages.macports.org/fondu/fondu-060102_1.darwin_12.x86_64.tbz2/_resources
+ set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2/_resources
if {[macports::getportresourcepath $url "" yes] != $default_path} {
return "FAIL: wrong resource path"
@@ -702,27 +651,29 @@
test mporttraverse {
- Mport traverse unit test. Uses 3rd column of the Portfile.
+ Mport traverse unit test. Uses 3rd line of the Portfile.
} -setup {
file mkdir $pwd/porttree
- file mkdir $pwd/porttree/cat1/fondu
- file mkdir $pwd/porttree/cat2/fondu
+ file mkdir $pwd/porttree/cat1/gcc_select
+ file mkdir $pwd/porttree/cat2/gcc_select
- file copy -force $pwd/Portfile $pwd/porttree/cat1/fondu/Portfile
- file copy -force $pwd/Portfile $pwd/porttree/cat2/fondu/Portfile
+ file copy -force $pwd/Portfile $pwd/porttree/cat1/gcc_select/Portfile
+ file copy -force $pwd/Portfile $pwd/porttree/cat2/gcc_select/Portfile
proc test_proc {file} {
global pwd res
set fd [open ${pwd}/porttree/${file}/Portfile r]
+ gets $fd
+ gets $fd
gets $fd line
- append res [lindex [split $line " "] 3]
+ append res [lindex [split $line " "] 1]
}
global res
set res ""
} -body {
mporttraverse test_proc $pwd/porttree
- if {$res != "8547285472"} {
+ if {$res != "1.01.0"} {
return "FAIL: porttree not traversed"
}
return "Mport traverse successful."
@@ -937,9 +888,10 @@
close $fd
set macports::autoconf::macports_conf_path $pwd/archive_sites
-
+ unset -nocomplain macports::archive_sites_conf_values
} -body {
set res [macports::get_archive_sites_conf_values]
+ puts $res
if {[lindex [split $res " "] 1] != "macports.org:nosubdir"} {
return "FAIL: name not set"
}
Modified: trunk/base/src/macports1.0/tests/macports_dlist.test
===================================================================
--- trunk/base/src/macports1.0/tests/macports_dlist.test 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/macports1.0/tests/macports_dlist.test 2014-04-05 06:49:20 UTC (rev 118582)
@@ -20,7 +20,7 @@
} -setup {
set mport [mportopen file://.]
set crit {
- provides fondu
+ provides gcc_select
porturl file://.
}
set crit2 { provides fondu2 }
@@ -43,7 +43,7 @@
} -setup {
set mport [mportopen file://.]
} -body {
- if {[dlist_search $mport provides fondu] != $mport} {
+ if {[dlist_search $mport provides gcc_select] != $mport} {
return "FAIL: matching item not found"
}
if {[dlist_search $mport provides fondu2] != ""} {
@@ -79,7 +79,7 @@
} -setup {
set mport [mportopen file://.]
} -body {
- if {[dlist_has_pending $mport fondu] != 1} {
+ if {[dlist_has_pending $mport gcc_select] != 1} {
return "FAIL: not detected"
}
if {[dlist_has_pending $mport provides] != 0} {
@@ -139,7 +139,7 @@
Dlist get next unit test.
} -setup {
set mport [mportopen file://.]
- set dict {fondu}
+ set dict {gcc_select}
} -body {
if {[dlist_get_next $mport $dict] != $mport} {
return "FAIL: wrong dlist"
Modified: trunk/base/src/package1.0/tests/portarchivefetch.test
===================================================================
--- trunk/base/src/package1.0/tests/portarchivefetch.test 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/package1.0/tests/portarchivefetch.test 2014-04-05 06:49:20 UTC (rev 118582)
@@ -85,9 +85,9 @@
env_init
array set ::portfetch::urlmap {
- fondu http://packages.macports.org/fondu/
+ db_select http://packages.macports.org/db_select/
}
- set portarchivefetch::archivefetch_urls {fondu fondu-060102_1.darwin_12.x86_64.tbz2}
+ set portarchivefetch::archivefetch_urls {db_select db_select-0.1_2.darwin_13.noarch.tbz2}
set target_state_fd [open $pwd/target w+]
set mport [mportopen file://.]
@@ -104,7 +104,7 @@
if {[catch {portarchivefetch::fetchfiles}] != 0} {
return "FAIL: cannot fetch archive"
}
- if {[file exists ${archivefetch.fulldestpath}/fondu-060102_1.darwin_12.x86_64.tbz2]} {
+ if {[file exists ${archivefetch.fulldestpath}/db_select-0.1_2.darwin_13.noarch.tbz2]} {
return "FAIL: unverified archive not discarded"
}
@@ -112,7 +112,7 @@
if {[portarchivefetch::fetchfiles] != 0} {
return "FAIL: cannot fetch archive"
}
- if {![file exists ${archivefetch.fulldestpath}/fondu-060102_1.darwin_12.x86_64.tbz2]} {
+ if {![file exists ${archivefetch.fulldestpath}/db_select-0.1_2.darwin_13.noarch.tbz2]} {
return "FAIL: verified archive deleted"
}
Modified: trunk/base/src/port1.0/tests/Portfile
===================================================================
--- trunk/base/src/port1.0/tests/Portfile 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/port1.0/tests/Portfile 2014-04-05 06:49:20 UTC (rev 118582)
@@ -1,36 +1,29 @@
-# $Id: Portfile 85472 2011-10-14 01:52:18Z dports at macports.org $
+# $Id$
-PortSystem 1.0
+PortSystem 1.0
-name fondu
-version 060102
-revision 1
-platforms darwin
-categories print
-license BSD
-maintainers nomaintainer
-homepage http://fondu.sourceforge.net/
-master_sites http://fondu.sourceforge.net/
+name gcc_select
+version 0.1
+revision 4
+categories sysutils
+platforms darwin
+license BSD
+maintainers mww
+supported_archs noarch
+description Switch the default compiler
+long_description gcc_select lets you switch the default compiler. \
+ It symlinks the standard compiler executables \
+ in the MacPorts prefix to the selected version.
-description A set of programs to interconvert between Mac font \
- formats and pfb, ttf, otf and bdf files on UNIX.
+homepage http://svn.macports.org/repository/macports/contrib/select/
+master_sites ${homepage}
+distname select-${version}
+checksums sha1 18e1f95c2ddd88210aa52eb696261859af2dc3a4
-long_description Dealing with Mac fonts is hard on other operating \
- systems because Mac fonts are stored in the resource \
- fork, and other operating systems do not support \
- this concept. Fondu will extract the resource fork \
- from either a MacBinary file or a BinHex file. Ufond \
- will create a resource fork inside a MacBinary file.
-
-checksums md5 e20861beacddc1ab392bef7813641bf8
-extract.suffix .tgz
-distfiles ${name}_src-${version}${extract.suffix}
-
patchfiles
-
patch {
foreach patch $patchfiles {
- set fd [open ${portpath}/files/${patch} r]
+ set fd [open ${filespath}/${patch} r]
set var [gets $fd]
close $fd
set fd [open ${workpath}/${distname}/test_patch w+]
@@ -39,17 +32,16 @@
}
}
-post-patch {
- reinplace "s|^CFLAGS = -g \$(WFLAGS)|CFLAGS = -g \$(WFLAGS) ${configure.cppflags} ${configure.cflags} ${configure.ldflags} [get_canonical_archflags]|g" ${worksrcpath}/Makefile.in
-}
+configure.args --mandir=${prefix}/share/man --name=gcc
-configure.args --bindir=${prefix}/bin \
- --mandir=${prefix}/share/man
-
post-destroot {
- eval xinstall -m 644 [glob ${worksrcpath}/*.1] ${destroot}${prefix}/share/man/man1/
+ xinstall -d ${destroot}${prefix}/etc/select/gcc
+ touch ${destroot}${prefix}/etc/select/gcc/base
}
test {
- file delete -force $worksrcpath/README
+ touch ${worksrcpath}/README
+ file delete -force ${worksrcpath}/README
}
+
+livecheck.type none
Modified: trunk/base/src/port1.0/tests/portdistcheck.test
===================================================================
--- trunk/base/src/port1.0/tests/portdistcheck.test 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/port1.0/tests/portdistcheck.test 2014-04-05 06:49:20 UTC (rev 118582)
@@ -24,12 +24,12 @@
set portpath $pwd
set filespath $pwd/files
- set name cocot
+ set name gcc_select
set subport $name
- set distname cocot-20080315
- set porturl "http://distfiles.macports.org/cocot/"
+ set distname select-0.1
+ set porturl "http://distfiles.macports.org/gcc_select/"
set master_sites $porturl
- set extract.suffix .tar.bz2
+ set extract.suffix .tar.gz
} -body {
set fetch.type standard
Modified: trunk/base/src/port1.0/tests/portinstall.test
===================================================================
--- trunk/base/src/port1.0/tests/portinstall.test 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/port1.0/tests/portinstall.test 2014-04-05 06:49:20 UTC (rev 118582)
@@ -30,9 +30,9 @@
set configure.build_arch build_arch
set portarchivetype tgz
-set subport fondu
-set version 3.0
-set revision 2
+set subport gcc_select
+set version 0.1
+set revision 4
test install_start {
Modified: trunk/base/src/port1.0/tests/portpatch.test
===================================================================
--- trunk/base/src/port1.0/tests/portpatch.test 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/port1.0/tests/portpatch.test 2014-04-05 06:49:20 UTC (rev 118582)
@@ -37,7 +37,7 @@
} -setup {
set macosx_version 12
- set subport fondu
+ set subport gcc_select
set filespath $pwd/files
set distpath $pwd/dist
set usealtworkpath yes
@@ -62,7 +62,7 @@
if {[$workername eval eval_targets patch]} {
return "FAIL: cannot run patch"
}
- if {![file exists $pwd/work/fondu-060102/test_patch]} {
+ if {![file exists $pwd/work/select-0.1/test_patch]} {
return "FAIL: missing patched file"
}
return "Patch successful."
Modified: trunk/base/src/port1.0/tests/portuninstall.test
===================================================================
--- trunk/base/src/port1.0/tests/portuninstall.test 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/src/port1.0/tests/portuninstall.test 2014-04-05 06:49:20 UTC (rev 118582)
@@ -19,9 +19,9 @@
source ./library.tcl
macports_worker_init
-set subport fondu
-set version 3.0
-set revision 2
+set subport gcc_select
+set version 0.1
+set revision 4
# test uninstall_start
Modified: trunk/base/tests/test/library.tcl
===================================================================
--- trunk/base/tests/test/library.tcl 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/tests/test/library.tcl 2014-04-05 06:49:20 UTC (rev 118582)
@@ -121,8 +121,8 @@
set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port configure 2>@1} ]
}
-# Run desroot command.
-proc port_desroot {pwd} {
+# Run destroot command.
+proc port_destroot {pwd} {
global path bindir portsrc work_dir output_file
file copy -force ${path}/statefile ${work_dir}/.macports.statefile-unknown-version.state
Modified: trunk/base/tests/test/statefile-unknown-version/test.tcl
===================================================================
--- trunk/base/tests/test/statefile-unknown-version/test.tcl 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/tests/test/statefile-unknown-version/test.tcl 2014-04-05 06:49:20 UTC (rev 118582)
@@ -11,7 +11,7 @@
set_dir
port_index
port_config $path
-port_desroot $path
+port_destroot $path
port_clean $path
proc state_unknown {warn} {
Modified: trunk/base/tests/test/statefile-version1/test.tcl
===================================================================
--- trunk/base/tests/test/statefile-version1/test.tcl 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/tests/test/statefile-version1/test.tcl 2014-04-05 06:49:20 UTC (rev 118582)
@@ -13,7 +13,7 @@
set_dir
port_index
port_config $path
-port_desroot $path
+port_destroot $path
port_clean $path
proc statefile_v1 {warn} {
Modified: trunk/base/tests/test/statefile-version1-outdated/test.tcl
===================================================================
--- trunk/base/tests/test/statefile-version1-outdated/test.tcl 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/tests/test/statefile-version1-outdated/test.tcl 2014-04-05 06:49:20 UTC (rev 118582)
@@ -12,8 +12,9 @@
port_index
port_config $path
file copy -force $path/statefile $work_dir/.macports.statefile-version1-outdated.state
+file attributes $work_dir/.macports.statefile-version1-outdated.state -permissions 0664
exec touch -t 197001010000.09 $work_dir/.macports.statefile-version1-outdated.state
-port_desroot $path
+port_destroot $path
port_clean $path
proc state_v1 {warn} {
Modified: trunk/base/tests/test/statefile-version2/test.tcl
===================================================================
--- trunk/base/tests/test/statefile-version2/test.tcl 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/tests/test/statefile-version2/test.tcl 2014-04-05 06:49:20 UTC (rev 118582)
@@ -16,7 +16,7 @@
file copy -force $path/statefile $work_dir/.macports.statefile-version2.state
exec sed -i'' -E "s/@CHECKSUM@/`openssl dgst -sha256 Portfile | \
awk '{print \$\$2}'`/" $work_dir/.macports.statefile-version2.state
-port_desroot $path
+port_destroot $path
port_clean $path
proc statefile_v2 {arg} {
Modified: trunk/base/tests/test/statefile-version2-invalid/test.tcl
===================================================================
--- trunk/base/tests/test/statefile-version2-invalid/test.tcl 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/tests/test/statefile-version2-invalid/test.tcl 2014-04-05 06:49:20 UTC (rev 118582)
@@ -12,7 +12,8 @@
port_index
port_config $path
file copy -force $path/statefile $work_dir/.macports.statefile-version2-invalid.state
-port_desroot $path
+file attributes $work_dir/.macports.statefile-version2-invalid.state -permissions 0664
+port_destroot $path
port_clean $path
proc state_v2_invalid {warn} {
Modified: trunk/base/tests/test/statefile-version2-outdated/test.tcl
===================================================================
--- trunk/base/tests/test/statefile-version2-outdated/test.tcl 2014-04-05 05:34:08 UTC (rev 118581)
+++ trunk/base/tests/test/statefile-version2-outdated/test.tcl 2014-04-05 06:49:20 UTC (rev 118582)
@@ -12,7 +12,8 @@
port_index
port_config $path
file copy -force $path/statefile $work_dir/.macports.statefile-version2-outdated.state
-port_desroot $path
+file attributes $work_dir/.macports.statefile-version2-outdated.state -permissions 0664
+port_destroot $path
port_clean $path
proc state_v2_out {warn} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140404/a575816c/attachment-0001.html>
More information about the macports-changes
mailing list