Scilab: fix use of configure cache for multicpptest test-suite
This commit is contained in:
parent
6201dec455
commit
908c9d1f14
2 changed files with 13 additions and 2 deletions
|
|
@ -17,22 +17,34 @@ top_builddir = @top_builddir@
|
||||||
|
|
||||||
include $(srcdir)/../common.mk
|
include $(srcdir)/../common.mk
|
||||||
|
|
||||||
|
# configure cache to speed up test run
|
||||||
|
CONF_CACHE=/tmp/scilab-test-suite.config.cache
|
||||||
CONFIG_SITE=$(CURDIR)/test-suite.config.site
|
CONFIG_SITE=$(CURDIR)/test-suite.config.site
|
||||||
export CONFIG_SITE
|
export CONFIG_SITE
|
||||||
|
|
||||||
|
enable_config_cache = \
|
||||||
|
echo 'cache_file=$(CONF_CACHE)' > $(CONFIG_SITE)
|
||||||
|
|
||||||
|
# need reset cache before multicpptest
|
||||||
|
reset_config_cache = \
|
||||||
|
rm -f $(CONF_CACHE)
|
||||||
|
|
||||||
# Rules for the different types of tests
|
# Rules for the different types of tests
|
||||||
%.cpptest:
|
%.cpptest:
|
||||||
$(setup)
|
$(setup)
|
||||||
|
$(enable_config_cache)
|
||||||
+$(swig_and_compile_cpp)
|
+$(swig_and_compile_cpp)
|
||||||
$(run_testcase)
|
$(run_testcase)
|
||||||
|
|
||||||
%.ctest:
|
%.ctest:
|
||||||
$(setup)
|
$(setup)
|
||||||
|
$(enable_config_cache)
|
||||||
+$(swig_and_compile_c)
|
+$(swig_and_compile_c)
|
||||||
$(run_testcase)
|
$(run_testcase)
|
||||||
|
|
||||||
%.multicpptest:
|
%.multicpptest:
|
||||||
$(setup)
|
$(setup)
|
||||||
|
$(reset_config_cache)
|
||||||
+$(swig_and_compile_multi_cpp)
|
+$(swig_and_compile_multi_cpp)
|
||||||
$(run_testcase)
|
$(run_testcase)
|
||||||
|
|
||||||
|
|
@ -45,7 +57,7 @@ run_testcase = \
|
||||||
|
|
||||||
# Clean: remove the generated files
|
# Clean: remove the generated files
|
||||||
%.clean:
|
%.clean:
|
||||||
@rm -f builder.sce loader.sce cleaner.sce $*_wrap.c $*_wrap.cxx lib$*lib.*
|
@rm -f builder.sce loader.sce cleaner.sce $*_wrap.c $*_wrap.cxx lib$*lib.* $(CONFIG_SITE) $(CONFIG_CACHE)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile scilab_clean
|
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile scilab_clean
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
cache_file=/tmp/scilab-test-suite.config.cache
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue