Ignore:
Timestamp:
Jul 14, 2015, 3:21:48 AM (4 years ago)
Author:
ryandesign@…
Message:

muniversal-1.0.tcl: add merger_test_args and merger_test_env

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

    r136145 r138613  
    22# $Id$
    33#
    4 # Copyright (c) 2009-2013 The MacPorts Project,
     4# Copyright (c) 2009-2015 The MacPorts Project,
    55# All rights reserved.
    66#
     
    3434#         merger_configure_env: associative array of configure.env variables
    3535#             merger_build_env: associative array of build.env variables
     36#              merger_test_env: associative array of test.env variables
    3637#          merger_destroot_env: associative array of destroot.env variables
    3738#                  merger_host: associative array of host values
    3839#        merger_configure_args: associative array of configure.args
    3940#            merger_build_args: associative array of build.args
     41#             merger_test_args: associative array of test.args
    4042#         merger_destroot_args: associative array of destroot.args
    4143#    merger_configure_compiler: associative array of configure.compiler
     
    727729            if { (${os.arch}=="i386" && ${arch}!="ppc64") || (${os.arch}=="powerpc" && ${arch}!="i386" && ${arch}!="x86_64") } {
    728730                ui_info "$UI_PREFIX [format [msgcat::mc "Testing %1\$s for architecture %2\$s"] ${subport} ${arch}]"
     731
     732                if { [info exists merger_test_env(${arch})] } {
     733                    test.env-append  $merger_test_env(${arch})
     734                }
     735                if { [info exists merger_test_args(${arch})] } {
     736                    test.args-append  $merger_test_args(${arch})
     737                }
    729738                set test_dir_save ${test.dir}
    730739                if { [string match "${worksrcpath}/*" ${test.dir}] } {
     
    742751
    743752                option test.dir ${test_dir_save}
     753                if { [info exists merger_test_args(${arch})] } {
     754                    test.args-delete $merger_test_args(${arch})
     755                }
     756                if { [info exists merger_test_env(${arch})] } {
     757                    test.env-delete  $merger_test_env(${arch})
     758                }
    744759            }
    745760        }
Note: See TracChangeset for help on using the changeset viewer.