Changeset 38756 for trunk/base/src

Timestamp:

07/30/08 03:13:23 (4 months ago)

Author:

afb@…

Message:

unbreak test case when ruby19 is not installed or not running leopard

Files:

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

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

@@ -64 +64 @@
                 ruby.setup {test_module tmod} 9.9 setup.rb {README INSTALL}
 
+                if {![file exists ${ruby.bin}]} { return }
                 if {"1.8" ne ${ruby.version}} { error "ruby.version failed: ${ruby.version}" }
                 if {"test_module" ne ${ruby.module}} { error "ruby.module failed" }
@@ -101 +102 @@
 
                 # changed prefix
+                if {![file exists ${ruby.bin}]} { return }
                 if {![string equal "1.9.0" ${ruby.version}]} { error "ruby.version failed: '${ruby.version}'" }
                 if {![string equal "rb19-test_module" ${name.found}]} { error "drived name failed: ${name.found}" }
@@ -130 +132 @@
                 if {"${prefix}/bin/gem" ne ${ruby.gem}} { error "variable ruby.gem missing" }
                 if {"1.8" ne ${ruby.version}} { error "variable ruby.version missing" }
-                if {"i686-darwin9" ne ${ruby.arch}} { error "variable ruby.arch missing" }
+                if {"" eq ${ruby.arch}} { error "variable ruby.arch missing" }
                 if {"${prefix}/lib/ruby/vendor_ruby/1.8" ne ${ruby.lib}} { error "variable ruby.lib missing" }
-                if {"${prefix}/lib/ruby/vendor_ruby/1.8/i686-darwin9" ne${ruby.archlib}} { error "variable ruby.archlib missing" }
+                if {"" eq ${ruby.archlib}} { error "variable ruby.archlib missing" }
         }