Changeset 641

Show
Ignore:
Timestamp:
08/28/10 15:54:24 (1 year ago)
Author:
braddr
Message:

Add more tests. Add support for .html tests, even though deprecated.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/test/Makefile

    r623 r641  
    4343export ARGS=-inline -release -gc -O -unittest -fPIC 
    4444 
    45 runnable_tests=$(wildcard runnable/*.d) 
     45runnable_tests=$(wildcard runnable/*.d) $(wildcard runnable/*.html) 
    4646runnable_test_results=$(addsuffix .out,$(addprefix $(RESULTS_DIR)/,$(runnable_tests))) 
    4747 
    …… 
    5353 
    5454$(RESULTS_DIR)/runnable/%.d.out: runnable/%.d $(RESULTS_DIR)/.created $(RESULTS_DIR)/combinations $(DMD) 
    55     $(QUIET) ./do_test.sh $(<D) $* 
     55    $(QUIET) ./do_test.sh $(<D) $* d 
     56 
     57$(RESULTS_DIR)/runnable/%.html.out: runnable/%.html $(RESULTS_DIR)/.created $(RESULTS_DIR)/combinations $(DMD) 
     58    $(QUIET) ./do_test.sh $(<D) $* html 
    5659 
    5760$(RESULTS_DIR)/compilable/%.d.out: compilable/%.d $(RESULTS_DIR)/.created $(RESULTS_DIR)/combinations $(DMD) 
    58     $(QUIET) ./do_test.sh $(<D) $* 
     61    $(QUIET) ./do_test.sh $(<D) $* d 
    5962 
    6063$(RESULTS_DIR)/fail_compilation/%.d.out: fail_compilation/%.d $(RESULTS_DIR)/.created $(RESULTS_DIR)/combinations $(DMD) 
    61     $(QUIET) ./do_test.sh $(<D) $* 
     64    $(QUIET) ./do_test.sh $(<D) $* d 
    6265 
    6366all: run_tests 

  • trunk/test/do_test.sh

    r623 r641  
    77input_dir=$1    # ex: runnable 
    88test_name=$2    # ex: pi 
     9test_extension=$3 # ex: d html or sh 
    910 
    1011# env vars 
    …… 
    1617shopt -s extglob 
    1718 
    18 input_file=${input_dir}/${test_name}.d 
     19input_file=${input_dir}/${test_name}.${test_extension} 
    1920output_dir=${RESULTS_DIR}/${input_dir} 
    20 output_file=${output_dir}/${test_name}.d.out 
     21output_file=${output_dir}/${test_name}.${test_extension}.out 
    2122test_app=${output_dir}/${test_name} 
    2223