[113705] trunk/base/src/port1.0/tests

cal at macports.org cal at macports.org
Sat Nov 23 08:10:31 PST 2013


Revision: 113705
          https://trac.macports.org/changeset/113705
Author:   cal at macports.org
Date:     2013-11-23 08:10:31 -0800 (Sat, 23 Nov 2013)
Log Message:
-----------
Fix test failures introduced by r113704 by testing that the returned paths are indeed fully normalized.

This will also serve as a test to ensure future changes will not re-introduce #39850.

Revision Links:
--------------
    https://trac.macports.org/changeset/113704

Modified Paths:
--------------
    trunk/base/src/port1.0/tests/portmain.test
    trunk/base/src/port1.0/tests/portutil.test

Modified: trunk/base/src/port1.0/tests/portmain.test
===================================================================
--- trunk/base/src/port1.0/tests/portmain.test	2013-11-23 15:54:10 UTC (rev 113704)
+++ trunk/base/src/port1.0/tests/portmain.test	2013-11-23 16:10:31 UTC (rev 113705)
@@ -43,7 +43,7 @@
     Get subbuildpath unit test.
 } -body {
     set portpath path/port/subport
-    if {[portmain::get_subbuildpath] != "./build/subport"} {
+    if {[portmain::get_subbuildpath] != [file normalize "./build/subport"]} {
         return "FAIL: wrong subbuildpath"
     }
     return "Get subbuild path successful."

Modified: trunk/base/src/port1.0/tests/portutil.test
===================================================================
--- trunk/base/src/port1.0/tests/portutil.test	2013-11-23 15:54:10 UTC (rev 113704)
+++ trunk/base/src/port1.0/tests/portutil.test	2013-11-23 16:10:31 UTC (rev 113705)
@@ -796,7 +796,7 @@
     set supported_archs {}
 
     set res [get_portimage_path]
-    if {$res != "dbpath/software/subport/subport-1.0_2var1.darwin_10.no.tgz"} {
+    if {$res != [file normalize "dbpath/software/subport/subport-1.0_2var1.darwin_10.no.tgz"]} {
         return "FAIL: invalid portimage_path"
     }
     return "Get portimage_path successful."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131123/c37e2212/attachment.html>


More information about the macports-changes mailing list