Note: This website is archived. For up-to-date information about D projects and development, please visit wiki.dlang.org.

Changeset 797

Show
Ignore:
Timestamp:
12/12/10 04:56:18 (14 years ago)
Author:
braddr
Message:

Fix to add -m${MODEL} on scripted test builds.
Fix to avoid transient error on win32 build in test44.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/test/runnable/test35.sh

    r680 r797  
    11#!/bin/bash 
    22 
    33dir=${RESULTS_DIR}/runnable 
    44dmddir=${RESULTS_DIR}${SEP}runnable 
    55output_file=${dir}/test35.sh.out 
    66 
    77rm -f ${output_file} 
    88 
    9 $DMD -Irunnable -od${dmddir} -c runnable/extra-files/test35.d >> ${output_file} 
     9$DMD -m${MODEL} -Irunnable -od${dmddir} -c runnable/extra-files/test35.d >> ${output_file} 
    1010if [ $? -ne 0 ]; then 
    1111    cat ${output_file} 
    1212    rm -f ${output_file} 
    1313    exit 1 
    1414fi 
    1515 
    16 $DMD -od${dmddir} -c -release runnable/imports/test35a.d >> ${output_file} 
     16$DMD -m${MODEL} -od${dmddir} -c -release runnable/imports/test35a.d >> ${output_file} 
    1717if [ $? -ne 0 ]; then 
    1818    cat ${output_file} 
    1919    rm -f ${output_file} 
    2020    exit 1 
    2121fi 
    2222 
    23 $DMD -of${dmddir}${SEP}test35 ${dir}/test35${OBJ} ${dir}/test35a${OBJ} >> ${output_file} 
     23$DMD -m${MODEL} -of${dmddir}${SEP}test35 ${dir}/test35${OBJ} ${dir}/test35a${OBJ} >> ${output_file} 
    2424if [ $? -ne 0 ]; then 
    2525    cat ${output_file} 
    2626    rm -f ${output_file} 
    2727    exit 1 
    2828fi 
    2929 
    3030./${dir}/test35 >> ${output_file} 
    3131if [ $? -ne 0 ]; then 
    3232    cat ${output_file} 
    3333    rm -f ${output_file} 
    3434    exit 1 
    3535fi 
    3636 
    3737rm ${dir}/{test35${OBJ},test35a${OBJ},test35${EXE}} 
    3838 

  • trunk/test/runnable/test39.sh

    r680 r797  
    11#!/bin/bash 
    22 
    33dir=${RESULTS_DIR}/runnable 
    44dmddir=${RESULTS_DIR}${SEP}runnable 
    55output_file=${dir}/test39.sh.out 
    66 
    77rm -f ${output_file} 
    88 
    9 $DMD -Irunnable -od${dmddir} -c runnable/extra-files/test39.d >> ${output_file} 
     9$DMD -m${MODEL} -Irunnable -od${dmddir} -c runnable/extra-files/test39.d >> ${output_file} 
    1010if [ $? -ne 0 ]; then 
    1111    cat ${output_file} 
    1212    rm -f ${output_file} 
    1313    exit 1 
    1414fi 
    1515 
    16 $DMD -Irunnable -od${dmddir} -c runnable/imports/test39a.d >> ${output_file} 
     16$DMD -m${MODEL} -Irunnable -od${dmddir} -c runnable/imports/test39a.d >> ${output_file} 
    1717if [ $? -ne 0 ]; then 
    1818    cat ${output_file} 
    1919    rm -f ${output_file} 
    2020    exit 1 
    2121fi 
    2222 
    2323if [ ${OS} == "win32" ]; then 
    2424    lib -c ${dmddir}${SEP}test39a.lib ${dmddir}${SEP}test39a.obj >> ${output_file} 2>&1 
    2525    LIBEXT=.lib 
    2626else 
    2727    ar -r ${dir}/test39a.a ${dir}/test39a.o >> ${output_file} 2>&1 
    2828    LIBEXT=.a 
    2929fi 
    3030if [ $? -ne 0 ]; then 
    3131    cat ${output_file} 
    3232    rm -f ${output_file} 
    3333    exit 1 
    3434fi 
    3535 
    36 $DMD -of${dmddir}${SEP}test39 ${dir}/test39${OBJ} ${dir}/test39a${LIBEXT} >> ${output_file} 
     36$DMD -m${MODEL} -of${dmddir}${SEP}test39 ${dir}/test39${OBJ} ${dir}/test39a${LIBEXT} >> ${output_file} 
    3737if [ $? -ne 0 ]; then 
    3838    cat ${output_file} 
    3939    rm -f ${output_file} 
    4040    exit 1 
    4141fi 
    4242 
    4343./${dir}/test39 >> ${output_file} 
    4444if [ $? -ne 0 ]; then 
    4545    cat ${output_file} 
    4646    rm -f ${output_file} 
    4747    exit 1 
    4848fi 
    4949 
    5050rm ${dir}/{test39${OBJ},test39a${OBJ},test39a${LIBEXT},test39${EXE}} 
    5151 

  • trunk/test/runnable/test44.sh

    r680 r797  
    11#!/bin/bash 
    22 
    33dir=${RESULTS_DIR}/runnable 
    44dmddir=${RESULTS_DIR}${SEP}runnable 
    55output_file=${dir}/test44.sh.out 
    66 
    77rm -f ${output_file} 
    88 
    9 $DMD -Irunnable -od${dmddir} -of${dmddir}${SEP}test44 runnable/extra-files/test44.d runnable/imports/test44a.d >> ${output_file} 
     9$DMD -m${MODEL} -Irunnable -od${dmddir} -of${dmddir}${SEP}test44_1 runnable/extra-files/test44.d runnable/imports/test44a.d >> ${output_file} 
    1010if [ $? -ne 0 ]; then 
    1111    cat ${output_file} 
    1212    rm -f ${output_file} 
    1313    exit 1 
    1414fi 
    1515 
    16 ./${dir}/test44 >> ${output_file} 
     16./${dir}/test44_1 >> ${output_file} 
    1717if [ $? -ne 0 ]; then 
    1818    cat ${output_file} 
    1919    rm -f ${output_file} 
    2020    exit 1 
    2121fi 
    2222 
    23 $DMD -Irunnable -od${dmddir} -of${dmddir}${SEP}test44 runnable/imports/test44a.d runnable/extra-files/test44.d >> ${output_file} 
     23$DMD -m${MODEL} -Irunnable -od${dmddir} -of${dmddir}${SEP}test44_2 runnable/imports/test44a.d runnable/extra-files/test44.d >> ${output_file} 
    2424if [ $? -ne 0 ]; then 
    2525    cat ${output_file} 
    2626    rm -f ${output_file} 
    2727    exit 1 
    2828fi 
    2929 
    30 ./${dir}/test44 >> ${output_file} 
     30./${dir}/test44_2 >> ${output_file} 
    3131if [ $? -ne 0 ]; then 
    3232    cat ${output_file} 
    3333    rm -f ${output_file} 
    3434    exit 1 
    3535fi 
    3636 
    37 rm ${dir}/{test44${OBJ},test44${EXE}} 
     37rm ${dir}/{test44_1${OBJ},test44_1${EXE},test44_2${OBJ},test44_2${EXE}} 
    3838