Changeset 38835


Ignore:
Timestamp:
Aug 1, 2008, 8:47:58 AM (11 years ago)
Author:
febeling@…
Message:

remove hard-coded mp prefix in test case setup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/resources/group/tests/ruby-1.0.tcl

    r38756 r38835  
    11#!/bin/sh
     2# This test needs macports to be installed to work
    23# start as tcl \
    34exec tclsh "$0" "$@"
    45
    5 set prefix                    /opt/local
     6set prefix                    [file dirname [file dirname [exec which port]]]
    67set os.platform               i686-darwin
    78
     
    4950        # Backwards compatible behaviour, assumes ruby1.8
    5051        proc test_rubysetup_ruby18_default {} {
     52                global prefix
    5153                global ruby.bin
    5254                global ruby.version
     
    7577                if {"port:ruby" ne ${depends_lib.found}} { error "depends_lib failed: ${depends_lib.found}" }
    7678
    77                 if {"/opt/local/lib/ruby/vendor_ruby/1.8" ne ${ruby.lib}} { error "ruby.lib failed: ${ruby.lib}" }
    78                 if {!(0 == [string first "/opt/local/lib/ruby/vendor_ruby/1.8/i686-darwin" ${ruby.archlib}])} { error "ruby.archlib failed: ${ruby.archlib}" }
     79                if {"${prefix}/lib/ruby/vendor_ruby/1.8" ne ${ruby.lib}} { error "ruby.lib failed: ${ruby.lib}" }
     80                if {!(0 == [string first "${prefix}/lib/ruby/vendor_ruby/1.8/i686-darwin" ${ruby.archlib}])} { error "ruby.archlib failed: ${ruby.archlib}" }
    7981        }
    8082
     
    8688
    8789        proc test_rubysetup_ruby19 {} {
     90                global prefix
    8891                global ruby.version
    8992                global ruby.module
     
    114117                if {![string equal "port:ruby19" ${depends_lib.found}]} { error "depends_lib failed: ${depends_lib.found}" }
    115118
    116                 if {![string equal "/opt/local/lib/ruby/vendor_ruby/1.9.0" ${ruby.lib}]} { error "ruby.lib failed: ${ruby.lib}" }
    117                 if {!(0 == [string first "/opt/local/lib/ruby/vendor_ruby/1.9.0/i686-darwin" ${ruby.archlib}])} { error "ruby.archlib failed: ${ruby.archlib}" }
     119                if {![string equal "${prefix}/lib/ruby/vendor_ruby/1.9.0" ${ruby.lib}]} { error "ruby.lib failed: ${ruby.lib}" }
     120                if {!(0 == [string first "${prefix}/lib/ruby/vendor_ruby/1.9.0/i686-darwin" ${ruby.archlib}])} { error "ruby.archlib failed: ${ruby.archlib}" }
    118121        }
    119122
Note: See TracChangeset for help on using the changeset viewer.