~olbohlen/oi-userland.git

parent: cb2d242e | patch | commit | ignore whitespace

Import test framework improvements from upstream

Alexander Pyhalov

2016-09-21 237543c1cd4e502ce2fed48f9010faace85a3e88

Import test framework improvements from upstream

8 files modified

	make-rules/ant.mk	2 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/attpackagemake.mk	2 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/cmake.mk	2 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/configure.mk	2 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/justmake.mk	2 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/makemaker.mk	10 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/setup.py.mk	10 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/shared-macros.mk	18 ●●●●● patch \| view \| raw \| blame \| history

 make-rules/ant.mk

@@ -52,6 +52,8 @@

# test the built source
$(BUILD_DIR)/%/.tested-and-compared:    $(BUILD_DIR)/%/.built
    $(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
    $(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
    $(COMPONENT_PRE_TEST_ACTION)
    -(cd $(COMPONENT_TEST_DIR) ; \
        $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

 make-rules/attpackagemake.mk

@@ -90,6 +90,8 @@

# test the built source
$(BUILD_DIR)/%/.tested-and-compared:    $(BUILD_DIR)/%/.built
    $(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
    $(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
    $(COMPONENT_PRE_TEST_ACTION)
    -(cd $(COMPONENT_TEST_DIR) ; \
        $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

 make-rules/cmake.mk

@@ -171,6 +171,8 @@

# test the built source
$(BUILD_DIR)/%/.tested-and-compared:    $(BUILD_DIR)/%/.built
    $(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
    $(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
    $(COMPONENT_PRE_TEST_ACTION)
    -(cd $(COMPONENT_TEST_DIR) ; \
        $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

 make-rules/configure.mk

@@ -184,6 +184,8 @@

# test the built source
$(BUILD_DIR)/%/.tested-and-compared:    $(BUILD_DIR)/%/.built
    $(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
    $(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
    $(COMPONENT_PRE_TEST_ACTION)
    -(cd $(COMPONENT_TEST_DIR) ; \
        $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

 make-rules/justmake.mk

@@ -76,6 +76,8 @@

# test the built source
$(BUILD_DIR)/%/.tested-and-compared:    $(BUILD_DIR)/%/.built
    $(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
    $(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
    $(COMPONENT_PRE_TEST_ACTION)
    -(cd $(COMPONENT_TEST_DIR) ; \
        $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

 make-rules/makemaker.mk

@@ -97,10 +97,10 @@

# Define bit specific and Perl version specific filenames.
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PERL_VERSION)-$(BITS).master
COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PERL_VERSION)-$(BITS)-results
COMPONENT_TEST_DIFFS =  $(COMPONENT_TEST_RESULTS_DIR)/test-$(PERL_VERSION)-$(BITS)-diffs
COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PERL_VERSION)-$(BITS).snapshot
COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_RESULTS_DIR)/transform-$(PERL_VERSION)-$(BITS)-results
COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_BUILD_DIR)/test-$(PERL_VERSION)-$(BITS)-results
COMPONENT_TEST_DIFFS =  $(COMPONENT_TEST_BUILD_DIR)/test-$(PERL_VERSION)-$(BITS)-diffs
COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_BUILD_DIR)/results-$(PERL_VERSION)-$(BITS).snapshot
COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_BUILD_DIR)/transform-$(PERL_VERSION)-$(BITS)-results

COMPONENT_TEST_TARGETS =    check
COMPONENT_TEST_ENV +=    $(COMMON_PERL_ENV)
@@ -114,6 +114,8 @@

# test the built source
$(BUILD_DIR)/%/.tested-and-compared:    $(BUILD_DIR)/%/.built
    $(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
    $(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
    $(COMPONENT_PRE_TEST_ACTION)
    -(cd $(COMPONENT_TEST_DIR) ; \
        $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

 make-rules/setup.py.mk

@@ -114,10 +114,10 @@

# Define bit specific and Python version specific filenames.
COMPONENT_TEST_MASTER =    $(COMPONENT_TEST_RESULTS_DIR)/results-$(PYTHON_VERSION)-$(BITS).master
COMPONENT_TEST_OUTPUT =    $(COMPONENT_TEST_RESULTS_DIR)/test-$(PYTHON_VERSION)-$(BITS)-results
COMPONENT_TEST_DIFFS =    $(COMPONENT_TEST_RESULTS_DIR)/test-$(PYTHON_VERSION)-$(BITS)-diffs
COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PYTHON_VERSION)-$(BITS).snapshot
COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_RESULTS_DIR)/transform-$(PYTHON_VERSION)-$(BITS)-results
COMPONENT_TEST_OUTPUT =    $(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-results
COMPONENT_TEST_DIFFS =    $(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-diffs
COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_BUILD_DIR)/results-$(PYTHON_VERSION)-$(BITS).snapshot
COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_BUILD_DIR)/transform-$(PYTHON_VERSION)-$(BITS)-results

COMPONENT_TEST_DEP =    $(BUILD_DIR)/%/.installed
COMPONENT_TEST_DIR =    $(COMPONENT_SRC)/test
@@ -139,6 +139,8 @@

# test the built source
$(BUILD_DIR)/%/.tested-and-compared:    $(COMPONENT_TEST_DEP)
    $(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
    $(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
    $(COMPONENT_PRE_TEST_ACTION)
    -(cd $(COMPONENT_TEST_DIR) ; \
        $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

 make-rules/shared-macros.mk

@@ -326,20 +326,26 @@
# set the default target for installation of the component
COMPONENT_INSTALL_TARGETS =    install

# set the default test results directory
# set the default build test results directory
COMPONENT_TEST_BUILD_DIR =    $(BUILD_DIR)/test/$(MACH$(BITS))

# set the default master test results directory
COMPONENT_TEST_RESULTS_DIR =    $(COMPONENT_DIR)/test

# set the default master test results file
COMPONENT_TEST_MASTER =        $(COMPONENT_TEST_RESULTS_DIR)/results-$(BITS).master

# set the default test results output file
COMPONENT_TEST_OUTPUT =        $(COMPONENT_TEST_RESULTS_DIR)/test-$(BITS)-results
COMPONENT_TEST_OUTPUT =        $(COMPONENT_TEST_BUILD_DIR)/test-$(BITS)-results

# set the default test results comparison diffs file
COMPONENT_TEST_DIFFS =        $(COMPONENT_TEST_RESULTS_DIR)/test-$(BITS)-diffs
COMPONENT_TEST_DIFFS =        $(COMPONENT_TEST_BUILD_DIR)/test-$(BITS)-diffs

# set the default test snapshot file
COMPONENT_TEST_SNAPSHOT =    $(COMPONENT_TEST_RESULTS_DIR)/results-$(BITS).snapshot
COMPONENT_TEST_SNAPSHOT =    $(COMPONENT_TEST_BUILD_DIR)/results-$(BITS).snapshot

# Normally $(GSED) is simplest, but some results files need more power.
COMPONENT_TEST_TRANSFORMER =    $(GSED)

# The set of default transforms to be applied to the test results to try
# to normalize them.
@@ -354,7 +360,7 @@
    if [ -e $(COMPONENT_TEST_MASTER) ]; \
    then \
        print "\#!/bin/sh" > $(COMPONENT_TEST_TRANSFORM_CMD); \
            print '$(GSED) ' \
            print '$(COMPONENT_TEST_TRANSFORMER) ' \
            $(COMPONENT_TEST_TRANSFORMS) \
                    ' \\' >> $(COMPONENT_TEST_TRANSFORM_CMD); \
            print '$(COMPONENT_TEST_OUTPUT) \\' \
@@ -364,7 +370,7 @@
    fi

# set the default command for performing any test result munging
COMPONENT_TEST_TRANSFORM_CMD =    $(COMPONENT_TEST_RESULTS_DIR)/transform-$(BITS)-results
COMPONENT_TEST_TRANSFORM_CMD =    $(COMPONENT_TEST_BUILD_DIR)/transform-$(BITS)-results

# set the default operation to run to perform test result normalization
COMPONENT_TEST_PERFORM_TRANSFORM = \

			@@ -52,6 +52,8 @@

			# test the built source
			$(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built
			$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
			$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
			$(COMPONENT_PRE_TEST_ACTION)
			-(cd $(COMPONENT_TEST_DIR) ; \
			$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

			@@ -90,6 +90,8 @@

			# test the built source
			$(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built
			$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
			$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
			$(COMPONENT_PRE_TEST_ACTION)
			-(cd $(COMPONENT_TEST_DIR) ; \
			$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

			@@ -171,6 +171,8 @@

			# test the built source
			$(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built
			$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
			$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
			$(COMPONENT_PRE_TEST_ACTION)
			-(cd $(COMPONENT_TEST_DIR) ; \
			$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

			@@ -184,6 +184,8 @@

			# test the built source
			$(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built
			$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
			$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
			$(COMPONENT_PRE_TEST_ACTION)
			-(cd $(COMPONENT_TEST_DIR) ; \
			$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

			@@ -76,6 +76,8 @@

			# test the built source
			$(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built
			$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
			$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
			$(COMPONENT_PRE_TEST_ACTION)
			-(cd $(COMPONENT_TEST_DIR) ; \
			$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

			@@ -97,10 +97,10 @@

			# Define bit specific and Perl version specific filenames.
			COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PERL_VERSION)-$(BITS).master
			COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PERL_VERSION)-$(BITS)-results
			COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PERL_VERSION)-$(BITS)-diffs
			COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PERL_VERSION)-$(BITS).snapshot
			COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_RESULTS_DIR)/transform-$(PERL_VERSION)-$(BITS)-results
			COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_BUILD_DIR)/test-$(PERL_VERSION)-$(BITS)-results
			COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_BUILD_DIR)/test-$(PERL_VERSION)-$(BITS)-diffs
			COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_BUILD_DIR)/results-$(PERL_VERSION)-$(BITS).snapshot
			COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_BUILD_DIR)/transform-$(PERL_VERSION)-$(BITS)-results

			COMPONENT_TEST_TARGETS = check
			COMPONENT_TEST_ENV += $(COMMON_PERL_ENV)
			@@ -114,6 +114,8 @@

			# test the built source
			$(BUILD_DIR)/%/.tested-and-compared: $(BUILD_DIR)/%/.built
			$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
			$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
			$(COMPONENT_PRE_TEST_ACTION)
			-(cd $(COMPONENT_TEST_DIR) ; \
			$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

			@@ -114,10 +114,10 @@

			# Define bit specific and Python version specific filenames.
			COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PYTHON_VERSION)-$(BITS).master
			COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PYTHON_VERSION)-$(BITS)-results
			COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_RESULTS_DIR)/test-$(PYTHON_VERSION)-$(BITS)-diffs
			COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PYTHON_VERSION)-$(BITS).snapshot
			COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_RESULTS_DIR)/transform-$(PYTHON_VERSION)-$(BITS)-results
			COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-results
			COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-diffs
			COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_BUILD_DIR)/results-$(PYTHON_VERSION)-$(BITS).snapshot
			COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_BUILD_DIR)/transform-$(PYTHON_VERSION)-$(BITS)-results

			COMPONENT_TEST_DEP = $(BUILD_DIR)/%/.installed
			COMPONENT_TEST_DIR = $(COMPONENT_SRC)/test
			@@ -139,6 +139,8 @@

			# test the built source
			$(BUILD_DIR)/%/.tested-and-compared: $(COMPONENT_TEST_DEP)
			$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
			$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
			$(COMPONENT_PRE_TEST_ACTION)
			-(cd $(COMPONENT_TEST_DIR) ; \
			$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \

			@@ -326,20 +326,26 @@
			# set the default target for installation of the component
			COMPONENT_INSTALL_TARGETS = install

			# set the default test results directory
			# set the default build test results directory
			COMPONENT_TEST_BUILD_DIR = $(BUILD_DIR)/test/$(MACH$(BITS))

			# set the default master test results directory
			COMPONENT_TEST_RESULTS_DIR = $(COMPONENT_DIR)/test

			# set the default master test results file
			COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(BITS).master

			# set the default test results output file
			COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_RESULTS_DIR)/test-$(BITS)-results
			COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_BUILD_DIR)/test-$(BITS)-results

			# set the default test results comparison diffs file
			COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_RESULTS_DIR)/test-$(BITS)-diffs
			COMPONENT_TEST_DIFFS = $(COMPONENT_TEST_BUILD_DIR)/test-$(BITS)-diffs

			# set the default test snapshot file
			COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_RESULTS_DIR)/results-$(BITS).snapshot
			COMPONENT_TEST_SNAPSHOT = $(COMPONENT_TEST_BUILD_DIR)/results-$(BITS).snapshot

			# Normally $(GSED) is simplest, but some results files need more power.
			COMPONENT_TEST_TRANSFORMER = $(GSED)

			# The set of default transforms to be applied to the test results to try
			# to normalize them.
			@@ -354,7 +360,7 @@
			if [ -e $(COMPONENT_TEST_MASTER) ]; \
			then \
			print "\#!/bin/sh" > $(COMPONENT_TEST_TRANSFORM_CMD); \
			print '$(GSED) ' \
			print '$(COMPONENT_TEST_TRANSFORMER) ' \
			$(COMPONENT_TEST_TRANSFORMS) \
			' \\' >> $(COMPONENT_TEST_TRANSFORM_CMD); \
			print '$(COMPONENT_TEST_OUTPUT) \\' \
			@@ -364,7 +370,7 @@
			fi

			# set the default command for performing any test result munging
			COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_RESULTS_DIR)/transform-$(BITS)-results
			COMPONENT_TEST_TRANSFORM_CMD = $(COMPONENT_TEST_BUILD_DIR)/transform-$(BITS)-results

			# set the default operation to run to perform test result normalization
			COMPONENT_TEST_PERFORM_TRANSFORM = \