Changeset 38835 for trunk/base/src

Timestamp:

08/01/08 01:47:58 (4 months ago)

Author:

febeling@…

Message:

remove hard-coded mp prefix in test case setup

Files:

• trunk/base/src/port1.0/resources/group/tests/ruby-1.0.tcl (modified) (5 diffs)

trunk/base/src/port1.0/resources/group/tests/ruby-1.0.tcl

@@ -1 +1 @@
 #!/bin/sh 
+# This test needs macports to be installed to work
 # start as tcl \
 exec tclsh "$0" "$@"
 
-set prefix                    /opt/local
+set prefix                    [file dirname [file dirname [exec which port]]]
 set os.platform               i686-darwin
 
@@ -49 +50 @@
         # Backwards compatible behaviour, assumes ruby1.8
         proc test_rubysetup_ruby18_default {} {
+                global prefix
                 global ruby.bin
                 global ruby.version
@@ -75 +77 @@
                 if {"port:ruby" ne ${depends_lib.found}} { error "depends_lib failed: ${depends_lib.found}" }
 
-                if {"/opt/local/lib/ruby/vendor_ruby/1.8" ne ${ruby.lib}} { error "ruby.lib failed: ${ruby.lib}" }
-                if {!(0 == [string first "/opt/local/lib/ruby/vendor_ruby/1.8/i686-darwin" ${ruby.archlib}])} { error "ruby.archlib failed: ${ruby.archlib}" }
+                if {"${prefix}/lib/ruby/vendor_ruby/1.8" ne ${ruby.lib}} { error "ruby.lib failed: ${ruby.lib}" }
+                if {!(0 == [string first "${prefix}/lib/ruby/vendor_ruby/1.8/i686-darwin" ${ruby.archlib}])} { error "ruby.archlib failed: ${ruby.archlib}" }
         }
 
@@ -86 +88 @@
 
         proc test_rubysetup_ruby19 {} {
+                global prefix
                 global ruby.version
                 global ruby.module
@@ -114 +117 @@
                 if {![string equal "port:ruby19" ${depends_lib.found}]} { error "depends_lib failed: ${depends_lib.found}" }
 
-                if {![string equal "/opt/local/lib/ruby/vendor_ruby/1.9.0" ${ruby.lib}]} { error "ruby.lib failed: ${ruby.lib}" }
-                if {!(0 == [string first "/opt/local/lib/ruby/vendor_ruby/1.9.0/i686-darwin" ${ruby.archlib}])} { error "ruby.archlib failed: ${ruby.archlib}" }
+                if {![string equal "${prefix}/lib/ruby/vendor_ruby/1.9.0" ${ruby.lib}]} { error "ruby.lib failed: ${ruby.lib}" }
+                if {!(0 == [string first "${prefix}/lib/ruby/vendor_ruby/1.9.0/i686-darwin" ${ruby.archlib}])} { error "ruby.archlib failed: ${ruby.archlib}" }
         }