autoconf runusr value into trace mode test, add darwin constraint to _is_valid_developer_dir test

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@120187 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Joshua Root
2014-05-19 00:29:11 +00:00
parent 0eaf141491
commit 7ea377f0c3
5 changed files with 12 additions and 5 deletions
Vendored
+2 -1
View File
@@ -11386,7 +11386,7 @@ $as_echo "yes" >&6; }
# 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 @@ do
"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" ;;
+1
View File
@@ -430,6 +430,7 @@ AC_CONFIG_FILES([
tests/Makefile
tests/test.tcl
tests/test/library.tcl
tests/test/trace/test.tcl
vendor/Makefile
])
@@ -33,4 +33,5 @@
namespace eval macports::autoconf {
variable prefix "@prefix@"
variable os_platform "@OS_PLATFORM@"
}
+6 -1
View File
@@ -7,6 +7,10 @@ namespace import tcltest::*
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 set_developer_dir {
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"
}
@@ -14,10 +14,9 @@ set path [file dirname [file normalize $argv0]]
load_variables $path
proc test_trace {} {
global path autoconf output_file
global path output_file
set line [get_line $autoconf "runusr*"]
set user [lrange [split $line " "] 1 1]
set user "@RUNUSR@"
set_dir
port_index