Changeset 641

Timestamp:

08/28/10 19:54:24 (14 years ago)

Author:

braddr

Message:

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

Files:

• trunk/test/do_test.sh (modified) (1 diff)
• trunk/test/Makefile (modified) (1 diff)
• trunk/test/runnable/extra-files/statictor.d.out (added)
• trunk/test/runnable/extra-files/statictor-postscript.sh (added)
• trunk/test/runnable/imports/test41a.d (added)
• trunk/test/runnable/statictor.d (added)
• trunk/test/runnable/test41.d (added)
• trunk/test/runnable/testhtml2.html (added)
• trunk/test/runnable/testhtml3.html (added)
• trunk/test/runnable/testhtml.html (added)

trunk/test/do_test.sh

@@ -1 +1 @@
-#!/bin/bash
-
-# enable debugging
-# set -x
-
-# cmd line args
-input_dir=$1    # ex: runnable
-test_name=$2    # ex: pi
+test_extension=$3 # ex: d html or sh
-
-# env vars
-# ARGS        == default set of dmd command line args to test combinatorially
-# DMD         == compiler path and filename
-# RESULTS_DIR == directory for temporary files and output
-
-# enable support for expressions like *( ) in substitutions
-shopt -s extglob
-
-d
+${test_extension}
-output_dir=${RESULTS_DIR}/${input_dir}
-d
+${test_extension}
-test_app=${output_dir}/${test_name}
-
-rm -f ${output_file}
-
-r_args=`grep REQUIRED_ARGS ${input_file} | tr -d \\\\r\\\\n`
-if [ ! -z "${r_args}" ]; then
-    r_args="${r_args/*REQUIRED_ARGS:*( )/}"
-    if [ ! -z "${r_args}" ]; then
-        extra_space=" "
-    fi
-fi
-
-p_args=`grep PERMUTE_ARGS ${input_file} | tr -d \\\\r\\\\n`
-if [ -z "${p_args}" ]; then
-    if [ "${input_dir}" != "fail_compilation" ]; then
-        p_args="${ARGS}"
-    fi
-else
-    p_args="${p_args/*PERMUTE_ARGS:*( )/}"
-fi

trunk/test/Makefile

@@ -25 +25 @@
-#                        default: (none)
-#
-#   EXTRA_SOURCES:       list of extra files to build and link along with the test
-#                        default: (none)
-#
-#   PERMUTE_ARGS:        the set of arguments to permute in multiple $(DMD) invocations
-#                        default: the make variable ARGS (see below)
-#
-#   POST_SCRIPT:         name of script to execute after test run
-#                        default: (none)
-#
-#   REQUIRED_ARGS:       arguments to add to the $(DMD) command line
-#                        default: (none)
-
-SHELL=/bin/bash
-QUIET=@
-export DMD=../src/dmd
-export RESULTS_DIR=test_results
-export ARGS=-inline -release -gc -O -unittest -fPIC
-
-
+ $(wildcard runnable/*.html)
-runnable_test_results=$(addsuffix .out,$(addprefix $(RESULTS_DIR)/,$(runnable_tests)))
-
-compilable_tests=$(wildcard compilable/*.d)
-compilable_test_results=$(addsuffix .out,$(addprefix $(RESULTS_DIR)/,$(compilable_tests)))
-
-fail_compilation_tests=$(wildcard fail_compilation/*.d)
-fail_compilation_test_results=$(addsuffix .out,$(addprefix $(RESULTS_DIR)/,$(fail_compilation_tests)))
-
-$(RESULTS_DIR)/runnable/%.d.out: runnable/%.d $(RESULTS_DIR)/.created $(RESULTS_DIR)/combinations $(DMD)
-
+
+
+
+
-
-$(RESULTS_DIR)/compilable/%.d.out: compilable/%.d $(RESULTS_DIR)/.created $(RESULTS_DIR)/combinations $(DMD)
-
+ d
-
-$(RESULTS_DIR)/fail_compilation/%.d.out: fail_compilation/%.d $(RESULTS_DIR)/.created $(RESULTS_DIR)/combinations $(DMD)
-
+ d
-
-all: run_tests
-
-quick:
-    $(MAKE) ARGS="" run_tests
-
-clean:
-    @echo "Removing output directory: $(RESULTS_DIR)"
-    $(QUIET)if [ -e $(RESULTS_DIR) ]; then rm -rf $(RESULTS_DIR); fi
-
-$(RESULTS_DIR)/.created:
-    @echo Creating output directory: $(RESULTS_DIR) 
-    $(QUIET)if [ ! -d $(RESULTS_DIR) ]; then mkdir $(RESULTS_DIR); fi
-    $(QUIET)if [ ! -d $(RESULTS_DIR)/runnable ]; then mkdir $(RESULTS_DIR)/runnable; fi
-    $(QUIET)if [ ! -d $(RESULTS_DIR)/compilable ]; then mkdir $(RESULTS_DIR)/compilable; fi
-    $(QUIET)if [ ! -d $(RESULTS_DIR)/fail_compilation ]; then mkdir $(RESULTS_DIR)/fail_compilation; fi
-    $(QUIET)touch $(RESULTS_DIR)/.created
-
-run_tests: start_runnable_tests start_compilable_tests start_fail_compilation_tests
-