[120187] trunk/base
jmr at macports.org
jmr at macports.org
Sun May 18 17:29:11 PDT 2014
Revision: 120187
https://trac.macports.org/changeset/120187
Author: jmr at macports.org
Date: 2014-05-18 17:29:11 -0700 (Sun, 18 May 2014)
Log Message:
-----------
autoconf runusr value into trace mode test, add darwin constraint to _is_valid_developer_dir test
Modified Paths:
--------------
trunk/base/configure
trunk/base/configure.ac
trunk/base/src/macports1.0/macports_test_autoconf.tcl.in
trunk/base/src/macports1.0/tests/macports.test
Added Paths:
-----------
trunk/base/tests/test/trace/test.tcl.in
Removed Paths:
-------------
trunk/base/tests/test/trace/test.tcl
Property Changed:
----------------
trunk/base/tests/test/trace/
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2014-05-19 00:05:16 UTC (rev 120186)
+++ trunk/base/configure 2014-05-19 00:29:11 UTC (rev 120187)
@@ -11386,7 +11386,7 @@
# Output
-ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/freebsd/Makefile portmgr/dmg/postflight setupenv.bash src/Makefile src/cregistry/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/package1.0/Makefile src/package1.0/package_test_autoconf.tcl src/pextlib1.0/Makefile src/port/Makefile src/port1.0/Makefile src/port1.0/port_autoconf.tcl src/port1.0/port_test_autoconf.tcl src/programs/Makefile src/registry2.0/Makefile src/registry2.0/registry_autoconf.tcl tests/Makefile tests/test.tcl tests/test/library.tcl vendor/Makefile"
+ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/freebsd/Makefile portmgr/dmg/postflight setupenv.bash src/Makefile src/cregistry/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/package1.0/Makefile src/package1.0/package_test_autoconf.tcl src/pextlib1.0/Makefile src/port/Makefile src/port1.0/Makefile src/port1.0/port_autoconf.tcl src/port1.0/port_test_autoconf.tcl src/programs/Makefile src/registry2.0/Makefile src/registry2.0/registry_autoconf.tcl tests/Makefile tests/test.tcl tests/test/library.tcl tests/test/trace/test.tcl vendor/Makefile"
ac_config_files="$ac_config_files src/dedup_portfiles.tcl"
@@ -12122,6 +12122,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"tests/test.tcl") CONFIG_FILES="$CONFIG_FILES tests/test.tcl" ;;
"tests/test/library.tcl") CONFIG_FILES="$CONFIG_FILES tests/test/library.tcl" ;;
+ "tests/test/trace/test.tcl") CONFIG_FILES="$CONFIG_FILES tests/test/trace/test.tcl" ;;
"vendor/Makefile") CONFIG_FILES="$CONFIG_FILES vendor/Makefile" ;;
"src/dedup_portfiles.tcl") CONFIG_FILES="$CONFIG_FILES src/dedup_portfiles.tcl" ;;
"src/images_to_archives.tcl") CONFIG_FILES="$CONFIG_FILES src/images_to_archives.tcl" ;;
Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac 2014-05-19 00:05:16 UTC (rev 120186)
+++ trunk/base/configure.ac 2014-05-19 00:29:11 UTC (rev 120187)
@@ -430,6 +430,7 @@
tests/Makefile
tests/test.tcl
tests/test/library.tcl
+ tests/test/trace/test.tcl
vendor/Makefile
])
Modified: trunk/base/src/macports1.0/macports_test_autoconf.tcl.in
===================================================================
--- trunk/base/src/macports1.0/macports_test_autoconf.tcl.in 2014-05-19 00:05:16 UTC (rev 120186)
+++ trunk/base/src/macports1.0/macports_test_autoconf.tcl.in 2014-05-19 00:29:11 UTC (rev 120187)
@@ -33,4 +33,5 @@
namespace eval macports::autoconf {
variable prefix "@prefix@"
+ variable os_platform "@OS_PLATFORM@"
}
Modified: trunk/base/src/macports1.0/tests/macports.test
===================================================================
--- trunk/base/src/macports1.0/tests/macports.test 2014-05-19 00:05:16 UTC (rev 120186)
+++ trunk/base/src/macports1.0/tests/macports.test 2014-05-19 00:29:11 UTC (rev 120187)
@@ -7,6 +7,10 @@
set pwd [file dirname [file normalize $argv0]]
source ../macports_test_autoconf.tcl
+
+# constraint for darwin platform
+testConstraint darwin [expr {$macports::autoconf::os_platform eq "darwin"}]
+
package require macports 1.0
# clean leftovers from interrupted tests
@@ -420,8 +424,9 @@
test _is_valid_developer_dir {
Check valid dev dir unit test.
+} -constraints {
+ darwin
} -body {
- set macports::set_developer /Applications/Xcode.app/Contents/Developer
if {[macports::_is_valid_developer_dir $macports::developer_dir] != 1} {
return "FAIL: valid dir not detected"
}
Property changes on: trunk/base/tests/test/trace
___________________________________________________________________
Modified: svn:ignore
- output
+ output
test.tcl
Deleted: trunk/base/tests/test/trace/test.tcl
===================================================================
--- trunk/base/tests/test/trace/test.tcl 2014-05-19 00:05:16 UTC (rev 120186)
+++ trunk/base/tests/test/trace/test.tcl 2014-05-19 00:29:11 UTC (rev 120187)
@@ -1,71 +0,0 @@
-package require tcltest 2
-
-# need pextlib to drop privs
-package require Pextlib 1.0
-
-namespace import tcltest::*
-
-source [file dirname $argv0]/../library.tcl
-
-makeFile "" $output_file
-makeDirectory $work_dir
-set path [file dirname [file normalize $argv0]]
-
-load_variables $path
-
-proc test_trace {} {
- global path autoconf output_file
-
- set line [get_line $autoconf "runusr*"]
- set user [lrange [split $line " "] 1 1]
-
- set_dir
- port_index
- port_clean $path
-
- file delete -force /tmp/hello-trace
- file delete -force /tmp/link-trace2
- file link -symbolic /tmp/link-trace2 /usr/include/unistd.h
-
- makeDirectory ../tracetesttmp
- if {[getuid] == 0} {
- file attributes ../tracetesttmp -owner $user
- exec chown -h $user /tmp/link-trace2
- }
-
- if {[getuid] == 0} {
- seteuid [name_to_uid $user]
- }
- exec touch ../tracetesttmp/delete-trace
- exec touch ../tracetesttmp/rename-trace
- exec mkdir ../tracetesttmp/rmdir-trace
- if {[getuid] == 0} {
- seteuid 0
- }
-
- port_trace $path
-
- file delete -force /tmp/link-trace2
- file delete -force /tmp/hello-trace
-
- set err "error*"
- set line [get_line $path/$output_file $err]
- set unsupported [get_line $path/$output_file "*tracelib not supported on this platform*"]
- if {$unsupported != -1 || $line == -1} {
- return "No errors found."
- } else {
- return $line
- }
-}
-
-test trace {
- Regression test for trace.
-} -constraints {
- tracemode_support
-} -body {
- test_trace
-} -result "No errors found."
-
-
-cleanup
-cleanupTests
Copied: trunk/base/tests/test/trace/test.tcl.in (from rev 120186, trunk/base/tests/test/trace/test.tcl)
===================================================================
--- trunk/base/tests/test/trace/test.tcl.in (rev 0)
+++ trunk/base/tests/test/trace/test.tcl.in 2014-05-19 00:29:11 UTC (rev 120187)
@@ -0,0 +1,70 @@
+package require tcltest 2
+
+# need pextlib to drop privs
+package require Pextlib 1.0
+
+namespace import tcltest::*
+
+source [file dirname $argv0]/../library.tcl
+
+makeFile "" $output_file
+makeDirectory $work_dir
+set path [file dirname [file normalize $argv0]]
+
+load_variables $path
+
+proc test_trace {} {
+ global path output_file
+
+ set user "@RUNUSR@"
+
+ set_dir
+ port_index
+ port_clean $path
+
+ file delete -force /tmp/hello-trace
+ file delete -force /tmp/link-trace2
+ file link -symbolic /tmp/link-trace2 /usr/include/unistd.h
+
+ makeDirectory ../tracetesttmp
+ if {[getuid] == 0} {
+ file attributes ../tracetesttmp -owner $user
+ exec chown -h $user /tmp/link-trace2
+ }
+
+ if {[getuid] == 0} {
+ seteuid [name_to_uid $user]
+ }
+ exec touch ../tracetesttmp/delete-trace
+ exec touch ../tracetesttmp/rename-trace
+ exec mkdir ../tracetesttmp/rmdir-trace
+ if {[getuid] == 0} {
+ seteuid 0
+ }
+
+ port_trace $path
+
+ file delete -force /tmp/link-trace2
+ file delete -force /tmp/hello-trace
+
+ set err "error*"
+ set line [get_line $path/$output_file $err]
+ set unsupported [get_line $path/$output_file "*tracelib not supported on this platform*"]
+ if {$unsupported != -1 || $line == -1} {
+ return "No errors found."
+ } else {
+ return $line
+ }
+}
+
+test trace {
+ Regression test for trace.
+} -constraints {
+ tracemode_support
+} -body {
+ test_trace
+} -result "No errors found."
+
+
+cleanup
+cleanupTests
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140518/6ebfc72a/attachment.html>
More information about the macports-changes
mailing list