[111455] trunk/base/src/package1.0
marius at macports.org
marius at macports.org
Sun Sep 22 23:49:17 PDT 2013
Revision: 111455
https://trac.macports.org/changeset/111455
Author: marius at macports.org
Date: 2013-09-22 23:49:16 -0700 (Sun, 22 Sep 2013)
Log Message:
-----------
package1.0: removed tabs, require files, hdiutil_path in package_test_autoconf.tcl
Modified Paths:
--------------
trunk/base/src/package1.0/package_test_autoconf.tcl.in
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
Modified: trunk/base/src/package1.0/package_test_autoconf.tcl.in
===================================================================
--- trunk/base/src/package1.0/package_test_autoconf.tcl.in 2013-09-23 05:38:47 UTC (rev 111454)
+++ trunk/base/src/package1.0/package_test_autoconf.tcl.in 2013-09-23 06:49:16 UTC (rev 111455)
@@ -35,3 +35,7 @@
variable macports_tcl_dir "@macports_tcl_dir@"
variable prefix "@prefix@"
}
+
+namespace eval portutil::autoconf {
+ variable hdiutil_path "@HDIUTIL@"
+}
Modified: trunk/base/src/package1.0/tests/portarchivefetch.test
===================================================================
--- trunk/base/src/package1.0/tests/portarchivefetch.test 2013-09-23 05:38:47 UTC (rev 111454)
+++ trunk/base/src/package1.0/tests/portarchivefetch.test 2013-09-23 06:49:16 UTC (rev 111455)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
package require tcltest 2
namespace import tcltest::*
Modified: trunk/base/src/package1.0/tests/portdmg.test
===================================================================
--- trunk/base/src/package1.0/tests/portdmg.test 2013-09-23 05:38:47 UTC (rev 111454)
+++ trunk/base/src/package1.0/tests/portdmg.test 2013-09-23 06:49:16 UTC (rev 111455)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
package require tcltest 2
namespace import tcltest::*
@@ -12,13 +14,11 @@
#set ui_options(ports_verbose) yes
mportinit ui_options
+package require portdmg 1.0
source ./library.tcl
macports_worker_init
-source ../portdmg.tcl
-source ../../port1.0/port_autoconf.tcl
-
# test dmg_main
@@ -39,13 +39,13 @@
} -body {
if {[portdmg::dmg_main] != 0} {
- return "FAIL: cannot create dmg"
+ return "FAIL: cannot create dmg"
}
if {![file exists $pwd/pkg/fondu-060102-1.dmg]} {
- return "FAIL: missing .dmg file"
+ return "FAIL: missing .dmg file"
}
if {![file exists $pwd/pkg/fondu-060102-1/fondu-060102.pkg]} {
- return "FAIL: invalid package.destpath"
+ return "FAIL: invalid package.destpath"
}
return "Package dmg successful."
Modified: trunk/base/src/package1.0/tests/portdpkg.test
===================================================================
--- trunk/base/src/package1.0/tests/portdpkg.test 2013-09-23 05:38:47 UTC (rev 111454)
+++ trunk/base/src/package1.0/tests/portdpkg.test 2013-09-23 06:49:16 UTC (rev 111455)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
package require tcltest 2
namespace import tcltest::*
@@ -12,13 +14,11 @@
#set ui_options(ports_verbose) yes
mportinit ui_options
+package require portdpkg 1.0
source ./library.tcl
macports_worker_init
-source ../portdpkg.tcl
-source ../../port1.0/port_autoconf.tcl
-
test main {
Port dpkg main unit test.
} -constraints { ![catch {exec which dpkg-deb}]
@@ -44,10 +44,10 @@
} -body {
if {[catch {portdpkg::main}] != 0} {
- return "FAIL: cannot create dmg"
+ return "FAIL: cannot create dmg"
}
if {![file exists $pwd/pkg/fondu_060102-1_all.deb]} {
- return "FAIL: missing .deb file"
+ return "FAIL: missing .deb file"
}
return "Package deb successful."
@@ -65,7 +65,7 @@
set revision 1
} -body {
if {[portdpkg::make_dependency_list $subport] != "fondu/060102"} {
- return "FAIL: could not make dependency list"
+ return "FAIL: could not make dependency list"
}
return "Make dependency list successful."
} -result "Make dependency list successful."
Modified: trunk/base/src/package1.0/tests/portmdmg.test
===================================================================
--- trunk/base/src/package1.0/tests/portmdmg.test 2013-09-23 05:38:47 UTC (rev 111454)
+++ trunk/base/src/package1.0/tests/portmdmg.test 2013-09-23 06:49:16 UTC (rev 111455)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
package require tcltest 2
namespace import tcltest::*
@@ -41,13 +43,13 @@
} -body {
if {[portmdmg::package_mdmg $subport $portepoch $version $revision] != 0} {
- return "FAIL: cannot create mdmg"
+ return "FAIL: cannot create mdmg"
}
if {![file exists $pwd/pkg/fondu-060102-1.dmg]} {
- return "FAIL: missing .dmg file"
+ return "FAIL: missing .dmg file"
}
if {![file exists $pwd/pkg/fondu-060102-1/fondu-i386_060102_1.mpkg]} {
- return "FAIL: invalid package.destpath"
+ return "FAIL: invalid package.destpath"
}
return "Package dmg successful."
Modified: trunk/base/src/package1.0/tests/portmpkg.test
===================================================================
--- trunk/base/src/package1.0/tests/portmpkg.test 2013-09-23 05:38:47 UTC (rev 111454)
+++ trunk/base/src/package1.0/tests/portmpkg.test 2013-09-23 06:49:16 UTC (rev 111455)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
package require tcltest 2
namespace import tcltest::*
@@ -12,13 +14,12 @@
#set ui_options(ports_verbose) yes
mportinit ui_options
+package require portmpkg 1.0
+package require portpkg 1.0
source ./library.tcl
macports_worker_init
-package require portmpkg 1.0
-package require portpkg 1.0
-
test mpkg_main {
Port mpkg main unit test.
} -setup {
@@ -32,19 +33,19 @@
} -body {
if {[portmpkg::mpkg_main] != 0} {
- return "FAIL: cannot create pkg"
+ return "FAIL: cannot create pkg"
}
if {![file exists $destpath/fondu-1_060102_1.mpkg/Contents/PkgInfo]} {
- return "FAIL: missing PkgInfo file"
+ return "FAIL: missing PkgInfo file"
}
if {![file exists $destpath/fondu-1_060102_1.mpkg/Contents/Info.plist]} {
- return "FAIL: missing Info.plist file"
+ return "FAIL: missing Info.plist file"
}
if {![file exists $destpath/fondu-1_060102_1.mpkg/Contents/Resources]} {
- return "FAIL: missing Resources dir"
+ return "FAIL: missing Resources dir"
}
if {![file exists $destpath/fondu-1_060102_1.mpkg/Contents/Packages/fondu-1_060102_1.pkg]} {
- return "FAIL: missing pkg file"
+ return "FAIL: missing pkg file"
}
return "Package mpkg successful."
@@ -66,7 +67,7 @@
} -body {
set res [portmpkg::make_dependency_list $subport $destination]
if { $res != "{fondu 0 060102 1 ditem_4}" } {
- return "FAIL: invalid dependency list"
+ return "FAIL: invalid dependency list"
}
return "Dependency list successful."
Modified: trunk/base/src/package1.0/tests/portpkg.test
===================================================================
--- trunk/base/src/package1.0/tests/portpkg.test 2013-09-23 05:38:47 UTC (rev 111454)
+++ trunk/base/src/package1.0/tests/portpkg.test 2013-09-23 06:49:16 UTC (rev 111455)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
package require tcltest 2
namespace import tcltest::*
@@ -12,13 +14,12 @@
#set ui_options(ports_verbose) yes
mportinit ui_options
+package require portmpkg 1.0
+package require portpkg 1.0
source ./library.tcl
macports_worker_init
-package require portmpkg 1.0
-package require portpkg 1.0
-
test pkg_main {
Port pkg main unit test.
} -constraints {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130922/50cf7c55/attachment.html>
More information about the macports-changes
mailing list