<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118582] trunk/base</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118582">118582</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-04-04 23:49:20 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>use self-hosted (and smaller) archives for tests involving downloads, plus various other test fixes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10testsPortfile">trunk/base/src/macports1.0/tests/Portfile</a></li>
<li><a href="#trunkbasesrcmacports10testsmacportstest">trunk/base/src/macports1.0/tests/macports.test</a></li>
<li><a href="#trunkbasesrcmacports10testsmacports_dlisttest">trunk/base/src/macports1.0/tests/macports_dlist.test</a></li>
<li><a href="#trunkbasesrcpackage10testsportarchivefetchtest">trunk/base/src/package1.0/tests/portarchivefetch.test</a></li>
<li><a href="#trunkbasesrcport10testsPortfile">trunk/base/src/port1.0/tests/Portfile</a></li>
<li><a href="#trunkbasesrcport10testsportdistchecktest">trunk/base/src/port1.0/tests/portdistcheck.test</a></li>
<li><a href="#trunkbasesrcport10testsportinstalltest">trunk/base/src/port1.0/tests/portinstall.test</a></li>
<li><a href="#trunkbasesrcport10testsportpatchtest">trunk/base/src/port1.0/tests/portpatch.test</a></li>
<li><a href="#trunkbasesrcport10testsportuninstalltest">trunk/base/src/port1.0/tests/portuninstall.test</a></li>
<li><a href="#trunkbaseteststestlibrarytcl">trunk/base/tests/test/library.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileunknownversiontesttcl">trunk/base/tests/test/statefile-unknown-version/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion1testtcl">trunk/base/tests/test/statefile-version1/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion1outdatedtesttcl">trunk/base/tests/test/statefile-version1-outdated/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion2testtcl">trunk/base/tests/test/statefile-version2/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion2invalidtesttcl">trunk/base/tests/test/statefile-version2-invalid/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion2outdatedtesttcl">trunk/base/tests/test/statefile-version2-outdated/test.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10testsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/Portfile (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,40 +1,30 @@
</span><del>-# $Id: Portfile 85472 2011-10-14 01:52:18Z dports@macports.org $
</del><ins>+# $Id$
</ins><span class="cx">
</span><del>-PortSystem 1.0
</del><ins>+PortSystem 1.0
</ins><span class="cx">
</span><del>-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/
</del><ins>+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.
</ins><span class="cx">
</span><del>-description A set of programs to interconvert between Mac font \
- formats and pfb, ttf, otf and bdf files on UNIX.
</del><ins>+homepage http://svn.macports.org/repository/macports/contrib/select/
+master_sites ${homepage}
+distname select-${version}
+checksums sha1 18e1f95c2ddd88210aa52eb696261859af2dc3a4
</ins><span class="cx">
</span><del>-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.
</del><ins>+configure.args --mandir=${prefix}/share/man --name=gcc
</ins><span class="cx">
</span><del>-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
-
</del><span class="cx"> post-destroot {
</span><del>- eval xinstall -m 644 [glob ${worksrcpath}/*.1] ${destroot}${prefix}/share/man/man1/
</del><ins>+ xinstall -d ${destroot}${prefix}/etc/select/gcc
+ touch ${destroot}${prefix}/etc/select/gcc/base
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-test.run yes
</del><ins>+livecheck.type none
</ins></span></pre></div>
<a id="trunkbasesrcmacports10testsmacportstest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/macports.test (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,20 +34,14 @@
</span><span class="cx"> #set ui_options(ports_verbose) yes
</span><span class="cx"> mportinit ui_options
</span><span class="cx">
</span><del>-package require portutil 1.0
-package require portinstall 1.0
-package require portuninstall 1.0
</del><span class="cx"> package require Thread
</span><del>-source ../../registry2.0/portuninstall.tcl
-source ../../port1.0/port_autoconf.tcl
</del><span class="cx"> source ./library.tcl
</span><del>-macports_worker_init
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> test mportclose {
</span><span class="cx"> Mport close unit test.
</span><span class="cx"> } -setup {
</span><del>- set mport [mportopen file://.]
</del><ins>+ set mport [mportopen file://${pwd}]
</ins><span class="cx"> } -body {
</span><span class="cx"> if {[catch {mportclose $mport}] != 0} {
</span><span class="cx"> return "FAIL: cannot run mportclose"
</span><span class="lines">@@ -62,12 +56,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> test mportinfo {
</span><del>- Mport info uni test.
</del><ins>+ Mport info unit test.
</ins><span class="cx"> } -setup {
</span><del>- set mport [mportopen file://.]
</del><ins>+ set mport [mportopen file://${pwd}]
</ins><span class="cx"> } -body {
</span><span class="cx"> set res [mportinfo $mport]
</span><del>- if {[lindex $res 2] != "canonical_active_variants"} {
</del><ins>+ catch {array set PortInfo $res}
+ if {![info exists PortInfo(canonical_active_variants)]} {
</ins><span class="cx"> return "FAIL: cannot get ::PortInfo"
</span><span class="cx"> }
</span><span class="cx"> return "Mport info successful."
</span><span class="lines">@@ -76,101 +71,56 @@
</span><span class="cx"> } -result "Mport info successful."
</span><span class="cx">
</span><span class="cx">
</span><del>-test mportopen_installed {
- Mport installed unit test.
-} -constraints {
- root
</del><ins>+test worker_init {
+ Worker init unit test.
</ins><span class="cx"> } -setup {
</span><del>- 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]
</del><ins>+ 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"
</ins><span class="cx"> }
</span><del>-
- proc getportworkpath_from_buildpath {portbuildpath} {
- return [file join $portbuildpath work]
</del><ins>+ if {[catch {$name eval source Portfile} result]} {
+ return "FAIL: cannot load Portfile"
</ins><span class="cx"> }
</span><del>-
- proc getportworkpath_from_portdir {portpath {portname ""}} {
- return [getportworkpath_from_buildpath [getportbuildpath $portpath $portname]]
</del><ins>+ if {[$name eval findBinary ls] ne "/bin/ls"} {
+ return "FAIL: alias not created"
</ins><span class="cx"> }
</span><del>-
- source $pwd/../../port1.0/portmain.tcl
-
- # sets up PortInfo array
- if {[eval_variants variations] != 0} {
- mportclose $mport
- error "Error evaluating variants"
</del><ins>+ if {[$name eval return \$os_arch] ne $macports::os_arch} {
+ return "FAIL: var not set"
</ins><span class="cx"> }
</span><ins>+ return "Worker init successful."
+} -result "Worker init successful."
</ins><span class="cx">
</span><del>- # set $version var
- set workername [ditem_key $mport workername]
</del><span class="cx">
</span><del>- # 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 {}
-
</del><ins>+test init_logging {
+ Init logging unit test.
+} -constraints {
+ root
+} -setup {
+ set mport [mportopen file://${pwd}]
</ins><span class="cx"> } -body {
</span><del>- set res [mportopen_installed $subport $version $revision $variants $options]
- if {![string match "ditem_*" $res]} {
- return "FAIL: installed port not opened"
</del><ins>+ if {[macports::init_logging $mport] != 0} {
+ return "FAIL: incorrect channels"
</ins><span class="cx"> }
</span><del>-
- if {[catch {mportclose $res}] != 0} {
- return "FAIL: cannot close port"
</del><ins>+ if {$macports::channels(any) != "stdout debuglog"} {
+ return "FAIL: incorrect channels(any)"
</ins><span class="cx"> }
</span><del>- if {[catch {mportclose $res}] != 1} {
- return "FAIL: installed port not closed"
</del><ins>+ 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)"
</ins><span class="cx"> }
</span><del>- return "Installed port open successful."
-
</del><ins>+ return "Init logging successful."
</ins><span class="cx"> } -cleanup {
</span><del>- if {[catch {portuninstall::uninstall_main}] != 0} {
- return "FAIL: cannot install port"
- }
</del><span class="cx"> mportclose $mport
</span><ins>+} -result "Init logging successful."
</ins><span class="cx">
</span><del>- file delete -force $pwd/work
- file delete -force $pwd/$subport
-} -result "Installed port open successful."
</del><span class="cx">
</span><del>-
</del><span class="cx"> test ui_isset {
</span><span class="cx"> Ui is set unit test.
</span><span class="cx"> } -body {
</span><span class="lines">@@ -203,34 +153,12 @@
</span><span class="cx"> } -result "Global option isset successful."
</span><span class="cx">
</span><span class="cx">
</span><del>-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."
-
-
</del><span class="cx"> test ch_logging {
</span><span class="cx"> Channel logging unit test. Assumes main.log filename.
</span><span class="cx"> } -constraints {
</span><span class="cx"> root
</span><span class="cx"> } -setup {
</span><del>- set mport [mportopen file://.]
</del><ins>+ set mport [mportopen file://${pwd}]
</ins><span class="cx">
</span><span class="cx"> set portname [_mportkey $mport subport]
</span><span class="cx"> set portpath [_mportkey $mport portpath]
</span><span class="lines">@@ -259,7 +187,7 @@
</span><span class="cx"> } -constraints {
</span><span class="cx"> root
</span><span class="cx"> } -setup {
</span><del>- set mport [mportopen file://.]
</del><ins>+ set mport [mportopen file://${pwd}]
</ins><span class="cx"> set ::logenabled 1
</span><span class="cx"> } -body {
</span><span class="cx"> if {[catch {macports::push_log $mport}] != 0} {
</span><span class="lines">@@ -280,7 +208,7 @@
</span><span class="cx"> set ::logenabled 1
</span><span class="cx"> set ::logstack [open $pwd/logstack w+]
</span><span class="cx"> set ::debuglog [open $pwd/log w+]
</span><del>- set mport [mportopen file://.]
</del><ins>+ set mport [mportopen file://${pwd}]
</ins><span class="cx"> if {[catch {macports::push_log $mport}] != 0} {
</span><span class="cx"> return "FAIL: cannot push log"
</span><span class="cx"> }
</span><span class="lines">@@ -504,6 +432,54 @@
</span><span class="cx"> # test mportinit
</span><span class="cx">
</span><span class="cx">
</span><ins>+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."
+
+
</ins><span class="cx"> test mportshutdown {
</span><span class="cx"> Mport shutdown unit test.
</span><span class="cx"> } -setup {
</span><span class="lines">@@ -557,33 +533,6 @@
</span><span class="cx"> } -result "Copy xcode plist successful."
</span><span class="cx">
</span><span class="cx">
</span><del>-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."
-
-
</del><span class="cx"> test create_thread {
</span><span class="cx"> Create thread unit test.
</span><span class="cx"> } -body {
</span><span class="lines">@@ -614,9 +563,9 @@
</span><span class="cx"> test fetch_port {
</span><span class="cx"> Fetch port unit test.
</span><span class="cx"> } -body {
</span><del>- set url http://packages.macports.org/fondu/fondu-060102_1.darwin_10.x86_64.tbz2
</del><ins>+ set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
</ins><span class="cx"> set res [macports::fetch_port $url]
</span><del>- if {$res != "${pwd}/portdbpath/portdirs/fondu-060102_1"} {
</del><ins>+ if {$res != "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
</ins><span class="cx"> return "FAIL: cannot fetch port"
</span><span class="cx"> }
</span><span class="cx"> return "Fetch port successful."
</span><span class="lines">@@ -640,9 +589,9 @@
</span><span class="cx"> } -setup {
</span><span class="cx"> close [open $pwd/local_file w+]
</span><span class="cx"> } -body {
</span><del>- set url http://fondu.sourceforge.net/fondu_src-060102.tgz
</del><ins>+ set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
</ins><span class="cx"> set res [macports::getportdir $url]
</span><del>- if {$res != "${pwd}/portdbpath/portdirs/fondu_src-060102"} {
</del><ins>+ if {$res != "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
</ins><span class="cx"> return "FAIL: invalid port directory"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -661,9 +610,9 @@
</span><span class="cx"> Get port resource path. Doesn't check for 'file' protocol.
</span><span class="cx"> } -body {
</span><span class="cx"> set macports::portdbpath $pwd/portdbpath
</span><del>- set url "http://packages.macports.org/fondu/fondu-060102_1.darwin_12.x86_64.tbz2"
</del><ins>+ set url "http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2"
</ins><span class="cx"> set default_path $pwd/portdbpath/sources/rsync.macports.org/release/tarballs/ports/_resources
</span><del>- set fallback_path $pwd/portdbpath/sources/packages.macports.org/fondu/fondu-060102_1.darwin_12.x86_64.tbz2/_resources
</del><ins>+ set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2/_resources
</ins><span class="cx">
</span><span class="cx"> if {[macports::getportresourcepath $url "" yes] != $default_path} {
</span><span class="cx"> return "FAIL: wrong resource path"
</span><span class="lines">@@ -702,27 +651,29 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> test mporttraverse {
</span><del>- Mport traverse unit test. Uses 3rd column of the Portfile.
</del><ins>+ Mport traverse unit test. Uses 3rd line of the Portfile.
</ins><span class="cx"> } -setup {
</span><span class="cx"> file mkdir $pwd/porttree
</span><del>- file mkdir $pwd/porttree/cat1/fondu
- file mkdir $pwd/porttree/cat2/fondu
</del><ins>+ file mkdir $pwd/porttree/cat1/gcc_select
+ file mkdir $pwd/porttree/cat2/gcc_select
</ins><span class="cx">
</span><del>- file copy -force $pwd/Portfile $pwd/porttree/cat1/fondu/Portfile
- file copy -force $pwd/Portfile $pwd/porttree/cat2/fondu/Portfile
</del><ins>+ file copy -force $pwd/Portfile $pwd/porttree/cat1/gcc_select/Portfile
+ file copy -force $pwd/Portfile $pwd/porttree/cat2/gcc_select/Portfile
</ins><span class="cx">
</span><span class="cx"> proc test_proc {file} {
</span><span class="cx"> global pwd res
</span><span class="cx"> set fd [open ${pwd}/porttree/${file}/Portfile r]
</span><ins>+ gets $fd
+ gets $fd
</ins><span class="cx"> gets $fd line
</span><del>- append res [lindex [split $line " "] 3]
</del><ins>+ append res [lindex [split $line " "] 1]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> global res
</span><span class="cx"> set res ""
</span><span class="cx"> } -body {
</span><span class="cx"> mporttraverse test_proc $pwd/porttree
</span><del>- if {$res != "8547285472"} {
</del><ins>+ if {$res != "1.01.0"} {
</ins><span class="cx"> return "FAIL: porttree not traversed"
</span><span class="cx"> }
</span><span class="cx"> return "Mport traverse successful."
</span><span class="lines">@@ -937,9 +888,10 @@
</span><span class="cx"> close $fd
</span><span class="cx">
</span><span class="cx"> set macports::autoconf::macports_conf_path $pwd/archive_sites
</span><del>-
</del><ins>+ unset -nocomplain macports::archive_sites_conf_values
</ins><span class="cx"> } -body {
</span><span class="cx"> set res [macports::get_archive_sites_conf_values]
</span><ins>+ puts $res
</ins><span class="cx"> if {[lindex [split $res " "] 1] != "macports.org:nosubdir"} {
</span><span class="cx"> return "FAIL: name not set"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcmacports10testsmacports_dlisttest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/macports_dlist.test (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> } -setup {
</span><span class="cx"> set mport [mportopen file://.]
</span><span class="cx"> set crit {
</span><del>- provides fondu
</del><ins>+ provides gcc_select
</ins><span class="cx"> porturl file://.
</span><span class="cx"> }
</span><span class="cx"> set crit2 { provides fondu2 }
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> } -setup {
</span><span class="cx"> set mport [mportopen file://.]
</span><span class="cx"> } -body {
</span><del>- if {[dlist_search $mport provides fondu] != $mport} {
</del><ins>+ if {[dlist_search $mport provides gcc_select] != $mport} {
</ins><span class="cx"> return "FAIL: matching item not found"
</span><span class="cx"> }
</span><span class="cx"> if {[dlist_search $mport provides fondu2] != ""} {
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> } -setup {
</span><span class="cx"> set mport [mportopen file://.]
</span><span class="cx"> } -body {
</span><del>- if {[dlist_has_pending $mport fondu] != 1} {
</del><ins>+ if {[dlist_has_pending $mport gcc_select] != 1} {
</ins><span class="cx"> return "FAIL: not detected"
</span><span class="cx"> }
</span><span class="cx"> if {[dlist_has_pending $mport provides] != 0} {
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> Dlist get next unit test.
</span><span class="cx"> } -setup {
</span><span class="cx"> set mport [mportopen file://.]
</span><del>- set dict {fondu}
</del><ins>+ set dict {gcc_select}
</ins><span class="cx"> } -body {
</span><span class="cx"> if {[dlist_get_next $mport $dict] != $mport} {
</span><span class="cx"> return "FAIL: wrong dlist"
</span></span></pre></div>
<a id="trunkbasesrcpackage10testsportarchivefetchtest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/tests/portarchivefetch.test (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -85,9 +85,9 @@
</span><span class="cx"> env_init
</span><span class="cx">
</span><span class="cx"> array set ::portfetch::urlmap {
</span><del>- fondu http://packages.macports.org/fondu/
</del><ins>+ db_select http://packages.macports.org/db_select/
</ins><span class="cx"> }
</span><del>- set portarchivefetch::archivefetch_urls {fondu fondu-060102_1.darwin_12.x86_64.tbz2}
</del><ins>+ set portarchivefetch::archivefetch_urls {db_select db_select-0.1_2.darwin_13.noarch.tbz2}
</ins><span class="cx"> set target_state_fd [open $pwd/target w+]
</span><span class="cx">
</span><span class="cx"> set mport [mportopen file://.]
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> if {[catch {portarchivefetch::fetchfiles}] != 0} {
</span><span class="cx"> return "FAIL: cannot fetch archive"
</span><span class="cx"> }
</span><del>- if {[file exists ${archivefetch.fulldestpath}/fondu-060102_1.darwin_12.x86_64.tbz2]} {
</del><ins>+ if {[file exists ${archivefetch.fulldestpath}/db_select-0.1_2.darwin_13.noarch.tbz2]} {
</ins><span class="cx"> return "FAIL: unverified archive not discarded"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> if {[portarchivefetch::fetchfiles] != 0} {
</span><span class="cx"> return "FAIL: cannot fetch archive"
</span><span class="cx"> }
</span><del>- if {![file exists ${archivefetch.fulldestpath}/fondu-060102_1.darwin_12.x86_64.tbz2]} {
</del><ins>+ if {![file exists ${archivefetch.fulldestpath}/db_select-0.1_2.darwin_13.noarch.tbz2]} {
</ins><span class="cx"> return "FAIL: verified archive deleted"
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbasesrcport10testsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/tests/Portfile (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,36 +1,29 @@
</span><del>-# $Id: Portfile 85472 2011-10-14 01:52:18Z dports@macports.org $
</del><ins>+# $Id$
</ins><span class="cx">
</span><del>-PortSystem 1.0
</del><ins>+PortSystem 1.0
</ins><span class="cx">
</span><del>-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/
</del><ins>+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.
</ins><span class="cx">
</span><del>-description A set of programs to interconvert between Mac font \
- formats and pfb, ttf, otf and bdf files on UNIX.
</del><ins>+homepage http://svn.macports.org/repository/macports/contrib/select/
+master_sites ${homepage}
+distname select-${version}
+checksums sha1 18e1f95c2ddd88210aa52eb696261859af2dc3a4
</ins><span class="cx">
</span><del>-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}
-
</del><span class="cx"> patchfiles
</span><del>-
</del><span class="cx"> patch {
</span><span class="cx"> foreach patch $patchfiles {
</span><del>- set fd [open ${portpath}/files/${patch} r]
</del><ins>+ set fd [open ${filespath}/${patch} r]
</ins><span class="cx"> set var [gets $fd]
</span><span class="cx"> close $fd
</span><span class="cx"> set fd [open ${workpath}/${distname}/test_patch w+]
</span><span class="lines">@@ -39,17 +32,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-post-patch {
- reinplace "s|^CFLAGS = -g \$(WFLAGS)|CFLAGS = -g \$(WFLAGS) ${configure.cppflags} ${configure.cflags} ${configure.ldflags} [get_canonical_archflags]|g" ${worksrcpath}/Makefile.in
-}
</del><ins>+configure.args --mandir=${prefix}/share/man --name=gcc
</ins><span class="cx">
</span><del>-configure.args --bindir=${prefix}/bin \
- --mandir=${prefix}/share/man
-
</del><span class="cx"> post-destroot {
</span><del>- eval xinstall -m 644 [glob ${worksrcpath}/*.1] ${destroot}${prefix}/share/man/man1/
</del><ins>+ xinstall -d ${destroot}${prefix}/etc/select/gcc
+ touch ${destroot}${prefix}/etc/select/gcc/base
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> test {
</span><del>- file delete -force $worksrcpath/README
</del><ins>+ touch ${worksrcpath}/README
+ file delete -force ${worksrcpath}/README
</ins><span class="cx"> }
</span><ins>+
+livecheck.type none
</ins></span></pre></div>
<a id="trunkbasesrcport10testsportdistchecktest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/tests/portdistcheck.test (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,12 +24,12 @@
</span><span class="cx"> set portpath $pwd
</span><span class="cx"> set filespath $pwd/files
</span><span class="cx">
</span><del>- set name cocot
</del><ins>+ set name gcc_select
</ins><span class="cx"> set subport $name
</span><del>- set distname cocot-20080315
- set porturl "http://distfiles.macports.org/cocot/"
</del><ins>+ set distname select-0.1
+ set porturl "http://distfiles.macports.org/gcc_select/"
</ins><span class="cx"> set master_sites $porturl
</span><del>- set extract.suffix .tar.bz2
</del><ins>+ set extract.suffix .tar.gz
</ins><span class="cx">
</span><span class="cx"> } -body {
</span><span class="cx"> set fetch.type standard
</span></span></pre></div>
<a id="trunkbasesrcport10testsportinstalltest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/tests/portinstall.test (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx"> set configure.build_arch build_arch
</span><span class="cx"> set portarchivetype tgz
</span><span class="cx">
</span><del>-set subport fondu
-set version 3.0
-set revision 2
</del><ins>+set subport gcc_select
+set version 0.1
+set revision 4
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> test install_start {
</span></span></pre></div>
<a id="trunkbasesrcport10testsportpatchtest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/tests/portpatch.test (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> } -setup {
</span><span class="cx"> set macosx_version 12
</span><span class="cx">
</span><del>- set subport fondu
</del><ins>+ set subport gcc_select
</ins><span class="cx"> set filespath $pwd/files
</span><span class="cx"> set distpath $pwd/dist
</span><span class="cx"> set usealtworkpath yes
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> if {[$workername eval eval_targets patch]} {
</span><span class="cx"> return "FAIL: cannot run patch"
</span><span class="cx"> }
</span><del>- if {![file exists $pwd/work/fondu-060102/test_patch]} {
</del><ins>+ if {![file exists $pwd/work/select-0.1/test_patch]} {
</ins><span class="cx"> return "FAIL: missing patched file"
</span><span class="cx"> }
</span><span class="cx"> return "Patch successful."
</span></span></pre></div>
<a id="trunkbasesrcport10testsportuninstalltest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/tests/portuninstall.test (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -19,9 +19,9 @@
</span><span class="cx"> source ./library.tcl
</span><span class="cx"> macports_worker_init
</span><span class="cx">
</span><del>-set subport fondu
-set version 3.0
-set revision 2
</del><ins>+set subport gcc_select
+set version 0.1
+set revision 4
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # test uninstall_start
</span></span></pre></div>
<a id="trunkbaseteststestlibrarytcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/library.tcl (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -121,8 +121,8 @@
</span><span class="cx"> set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port configure 2>@1} ]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Run desroot command.
-proc port_desroot {pwd} {
</del><ins>+# Run destroot command.
+proc port_destroot {pwd} {
</ins><span class="cx"> global path bindir portsrc work_dir output_file
</span><span class="cx">
</span><span class="cx"> file copy -force ${path}/statefile ${work_dir}/.macports.statefile-unknown-version.state
</span></span></pre></div>
<a id="trunkbaseteststeststatefileunknownversiontesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-unknown-version/test.tcl (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> set_dir
</span><span class="cx"> port_index
</span><span class="cx"> port_config $path
</span><del>-port_desroot $path
</del><ins>+port_destroot $path
</ins><span class="cx"> port_clean $path
</span><span class="cx">
</span><span class="cx"> proc state_unknown {warn} {
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion1testtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version1/test.tcl (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> set_dir
</span><span class="cx"> port_index
</span><span class="cx"> port_config $path
</span><del>-port_desroot $path
</del><ins>+port_destroot $path
</ins><span class="cx"> port_clean $path
</span><span class="cx">
</span><span class="cx"> proc statefile_v1 {warn} {
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion1outdatedtesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version1-outdated/test.tcl (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -12,8 +12,9 @@
</span><span class="cx"> port_index
</span><span class="cx"> port_config $path
</span><span class="cx"> file copy -force $path/statefile $work_dir/.macports.statefile-version1-outdated.state
</span><ins>+file attributes $work_dir/.macports.statefile-version1-outdated.state -permissions 0664
</ins><span class="cx"> exec touch -t 197001010000.09 $work_dir/.macports.statefile-version1-outdated.state
</span><del>-port_desroot $path
</del><ins>+port_destroot $path
</ins><span class="cx"> port_clean $path
</span><span class="cx">
</span><span class="cx"> proc state_v1 {warn} {
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion2testtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version2/test.tcl (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> file copy -force $path/statefile $work_dir/.macports.statefile-version2.state
</span><span class="cx"> exec sed -i'' -E "s/@CHECKSUM@/`openssl dgst -sha256 Portfile | \
</span><span class="cx"> awk '{print \$\$2}'`/" $work_dir/.macports.statefile-version2.state
</span><del>-port_desroot $path
</del><ins>+port_destroot $path
</ins><span class="cx"> port_clean $path
</span><span class="cx">
</span><span class="cx"> proc statefile_v2 {arg} {
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion2invalidtesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version2-invalid/test.tcl (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -12,7 +12,8 @@
</span><span class="cx"> port_index
</span><span class="cx"> port_config $path
</span><span class="cx"> file copy -force $path/statefile $work_dir/.macports.statefile-version2-invalid.state
</span><del>-port_desroot $path
</del><ins>+file attributes $work_dir/.macports.statefile-version2-invalid.state -permissions 0664
+port_destroot $path
</ins><span class="cx"> port_clean $path
</span><span class="cx">
</span><span class="cx"> proc state_v2_invalid {warn} {
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion2outdatedtesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version2-outdated/test.tcl (118581 => 118582)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -12,7 +12,8 @@
</span><span class="cx"> port_index
</span><span class="cx"> port_config $path
</span><span class="cx"> file copy -force $path/statefile $work_dir/.macports.statefile-version2-outdated.state
</span><del>-port_desroot $path
</del><ins>+file attributes $work_dir/.macports.statefile-version2-outdated.state -permissions 0664
+port_destroot $path
</ins><span class="cx"> port_clean $path
</span><span class="cx">
</span><span class="cx"> proc state_v2_out {warn} {
</span></span></pre>
</div>
</div>
</body>
</html>