[Genabel-commits] r1872 - in pkg/OmicABELnoMM: . tests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Oct 28 18:00:58 CET 2014
Author: lckarssen
Date: 2014-10-28 18:00:57 +0100 (Tue, 28 Oct 2014)
New Revision: 1872
Modified:
pkg/OmicABELnoMM/Makefile.am
pkg/OmicABELnoMM/tests/Makefile.am
Log:
Small update to the Automake files: replaced a literal path in a bunch of file names with a variable.
Modified: pkg/OmicABELnoMM/Makefile.am
===================================================================
--- pkg/OmicABELnoMM/Makefile.am 2014-10-28 16:46:48 UTC (rev 1871)
+++ pkg/OmicABELnoMM/Makefile.am 2014-10-28 17:00:57 UTC (rev 1872)
@@ -1,12 +1,13 @@
# This is the top Makefile.am for OmicABELnoMM. OmicABELnoMM uses a
# non-recursive Makefile, so make sure that path names are included,
-# etc.
+# etc. Consequently, the order of the includes also matters w.r.t. the
+# definition of variables etc.
# The includes below load the Automake files for the specific
# subdirectories. Automake integrates them all in one large Makefile.
CLEANFILES =
include $(srcdir)/src/Makefile.am
+include $(srcdir)/examples/Makefile.am
include $(srcdir)/tests/Makefile.am
-include $(srcdir)/examples/Makefile.am
include $(srcdir)/doc/Makefile.am
Modified: pkg/OmicABELnoMM/tests/Makefile.am
===================================================================
--- pkg/OmicABELnoMM/tests/Makefile.am 2014-10-28 16:46:48 UTC (rev 1871)
+++ pkg/OmicABELnoMM/tests/Makefile.am 2014-10-28 17:00:57 UTC (rev 1872)
@@ -14,171 +14,172 @@
# when running 'make dist'. Otherwise running 'make check' fails if
# run by the user (since the test program doesn't check for the
# directory's existence).
+testresultsdir = $(exmpldir)/results
tests_test_omicabelnomm_SOURCES = \
$(oanomm_headers) \
$(oanomm_cpp) \
- examples/results \
+ $(testresultsdir) \
tests/test.cpp
TESTS = $(check_PROGRAMS)
-cleanfiles_tests = examples/results/dosages__dis.txt \
- examples/results/dosages_add__dis.txt \
- examples/results/dosages_dom__dis.txt \
- examples/results/dosages_excl__dis.txt \
- examples/results/dosages_excl_add__dis.txt \
- examples/results/dosages_excl_dom__dis.txt \
- examples/results/dosages_excl_myadd__dis.txt \
- examples/results/dosages_excl_mylin__dis.txt \
- examples/results/dosages_excl_res__dis.txt \
- examples/results/dosages_myadd__dis.txt \
- examples/results/dosages_mylin__dis.txt \
- examples/results/dosages_res__dis.txt \
- examples/results/multi_inter_011_dis.txt \
- examples/results/multi_inter_0_dis.txt \
- examples/results/multi_inter_10_dis.txt \
- examples/results/multi_inter_11_dis.txt \
- examples/results/multi_inter_1RR_dis.txt \
- examples/results/multi_inter_1_dis.txt \
- examples/results/multi_inter_R0_dis.txt \
- examples/results/multi_inter_R1_dis.txt \
- examples/results/multi_inter_R_dis.txt \
- examples/results/multi_inter_add_011_dis.txt \
- examples/results/multi_inter_add_0_dis.txt \
- examples/results/multi_inter_add_10_dis.txt \
- examples/results/multi_inter_add_11_dis.txt \
- examples/results/multi_inter_add_1RR_dis.txt \
- examples/results/multi_inter_add_1_dis.txt \
- examples/results/multi_inter_add_R0_dis.txt \
- examples/results/multi_inter_add_R1_dis.txt \
- examples/results/multi_inter_add_R_dis.txt \
- examples/results/multi_inter_dom_011_dis.txt \
- examples/results/multi_inter_dom_0_dis.txt \
- examples/results/multi_inter_dom_10_dis.txt \
- examples/results/multi_inter_dom_11_dis.txt \
- examples/results/multi_inter_dom_1RR_dis.txt \
- examples/results/multi_inter_dom_1_dis.txt \
- examples/results/multi_inter_dom_R0_dis.txt \
- examples/results/multi_inter_dom_R1_dis.txt \
- examples/results/multi_inter_dom_R_dis.txt \
- examples/results/multi_inter_keep_R0_dis.txt \
- examples/results/multi_inter_keep_RR_dis.txt \
- examples/results/multi_inter_keep_R_dis.txt \
- examples/results/multi_inter_keep_add_R0_dis.txt \
- examples/results/multi_inter_keep_add_RR_dis.txt \
- examples/results/multi_inter_keep_add_R_dis.txt \
- examples/results/multi_inter_keep_dom_R0_dis.txt \
- examples/results/multi_inter_keep_dom_RR_dis.txt \
- examples/results/multi_inter_keep_dom_R_dis.txt \
- examples/results/multi_inter_keep_myadd_R0_dis.txt \
- examples/results/multi_inter_keep_myadd_RR_dis.txt \
- examples/results/multi_inter_keep_myadd_R_dis.txt \
- examples/results/multi_inter_keep_mylin_R0_dis.txt \
- examples/results/multi_inter_keep_mylin_RR_dis.txt \
- examples/results/multi_inter_keep_mylin_R_dis.txt \
- examples/results/multi_inter_keep_res_R0_dis.txt \
- examples/results/multi_inter_keep_res_RR_dis.txt \
- examples/results/multi_inter_keep_res_R_dis.txt \
- examples/results/multi_inter_myadd_011_dis.txt \
- examples/results/multi_inter_myadd_0_dis.txt \
- examples/results/multi_inter_myadd_10_dis.txt \
- examples/results/multi_inter_myadd_11_dis.txt \
- examples/results/multi_inter_myadd_1RR_dis.txt \
- examples/results/multi_inter_myadd_1_dis.txt \
- examples/results/multi_inter_myadd_R0_dis.txt \
- examples/results/multi_inter_myadd_R1_dis.txt \
- examples/results/multi_inter_myadd_R_dis.txt \
- examples/results/multi_inter_mylin_011_dis.txt \
- examples/results/multi_inter_mylin_0_dis.txt \
- examples/results/multi_inter_mylin_10_dis.txt \
- examples/results/multi_inter_mylin_11_dis.txt \
- examples/results/multi_inter_mylin_1RR_dis.txt \
- examples/results/multi_inter_mylin_1_dis.txt \
- examples/results/multi_inter_mylin_R0_dis.txt \
- examples/results/multi_inter_mylin_R1_dis.txt \
- examples/results/multi_inter_mylin_R_dis.txt \
- examples/results/multi_inter_res_011_dis.txt \
- examples/results/multi_inter_res_0_dis.txt \
- examples/results/multi_inter_res_10_dis.txt \
- examples/results/multi_inter_res_11_dis.txt \
- examples/results/multi_inter_res_1RR_dis.txt \
- examples/results/multi_inter_res_1_dis.txt \
- examples/results/multi_inter_res_R0_dis.txt \
- examples/results/multi_inter_res_R1_dis.txt \
- examples/results/multi_inter_res_R_dis.txt \
- examples/results/normal_dis.txt \
- examples/results/single_inter_011_dis.txt \
- examples/results/single_inter_0_dis.txt \
- examples/results/single_inter_10_dis.txt \
- examples/results/single_inter_11_dis.txt \
- examples/results/single_inter_1RR_dis.txt \
- examples/results/single_inter_1_dis.txt \
- examples/results/single_inter_R0_dis.txt \
- examples/results/single_inter_R1_dis.txt \
- examples/results/single_inter_R_dis.txt \
- examples/results/single_inter_add_011_dis.txt \
- examples/results/single_inter_add_0_dis.txt \
- examples/results/single_inter_add_10_dis.txt \
- examples/results/single_inter_add_11_dis.txt \
- examples/results/single_inter_add_1RR_dis.txt \
- examples/results/single_inter_add_1_dis.txt \
- examples/results/single_inter_add_R0_dis.txt \
- examples/results/single_inter_add_R1_dis.txt \
- examples/results/single_inter_add_R_dis.txt \
- examples/results/single_inter_dom_011_dis.txt \
- examples/results/single_inter_dom_0_dis.txt \
- examples/results/single_inter_dom_10_dis.txt \
- examples/results/single_inter_dom_11_dis.txt \
- examples/results/single_inter_dom_1RR_dis.txt \
- examples/results/single_inter_dom_1_dis.txt \
- examples/results/single_inter_dom_R0_dis.txt \
- examples/results/single_inter_dom_R1_dis.txt \
- examples/results/single_inter_dom_R_dis.txt \
- examples/results/single_inter_keep_R0_dis.txt \
- examples/results/single_inter_keep_RR_dis.txt \
- examples/results/single_inter_keep_R_dis.txt \
- examples/results/single_inter_keep_add_R0_dis.txt \
- examples/results/single_inter_keep_add_RR_dis.txt \
- examples/results/single_inter_keep_add_R_dis.txt \
- examples/results/single_inter_keep_dom_R0_dis.txt \
- examples/results/single_inter_keep_dom_RR_dis.txt \
- examples/results/single_inter_keep_dom_R_dis.txt \
- examples/results/single_inter_keep_myadd_R0_dis.txt \
- examples/results/single_inter_keep_myadd_RR_dis.txt \
- examples/results/single_inter_keep_myadd_R_dis.txt \
- examples/results/single_inter_keep_mylin_R0_dis.txt \
- examples/results/single_inter_keep_mylin_RR_dis.txt \
- examples/results/single_inter_keep_mylin_R_dis.txt \
- examples/results/single_inter_keep_res_R0_dis.txt \
- examples/results/single_inter_keep_res_RR_dis.txt \
- examples/results/single_inter_keep_res_R_dis.txt \
- examples/results/single_inter_myadd_011_dis.txt \
- examples/results/single_inter_myadd_0_dis.txt \
- examples/results/single_inter_myadd_10_dis.txt \
- examples/results/single_inter_myadd_11_dis.txt \
- examples/results/single_inter_myadd_1RR_dis.txt \
- examples/results/single_inter_myadd_1_dis.txt \
- examples/results/single_inter_myadd_R0_dis.txt \
- examples/results/single_inter_myadd_R1_dis.txt \
- examples/results/single_inter_myadd_R_dis.txt \
- examples/results/single_inter_mylin_011_dis.txt \
- examples/results/single_inter_mylin_0_dis.txt \
- examples/results/single_inter_mylin_10_dis.txt \
- examples/results/single_inter_mylin_11_dis.txt \
- examples/results/single_inter_mylin_1RR_dis.txt \
- examples/results/single_inter_mylin_1_dis.txt \
- examples/results/single_inter_mylin_R0_dis.txt \
- examples/results/single_inter_mylin_R1_dis.txt \
- examples/results/single_inter_mylin_R_dis.txt \
- examples/results/single_inter_res_011_dis.txt \
- examples/results/single_inter_res_0_dis.txt \
- examples/results/single_inter_res_10_dis.txt \
- examples/results/single_inter_res_11_dis.txt \
- examples/results/single_inter_res_1RR_dis.txt \
- examples/results/single_inter_res_1_dis.txt \
- examples/results/single_inter_res_R0_dis.txt \
- examples/results/single_inter_res_R1_dis.txt \
- examples/results/single_inter_res_R_dis.txt
+cleanfiles_tests = $(testresultsdir)/dosages__dis.txt \
+ $(testresultsdir)/dosages_add__dis.txt \
+ $(testresultsdir)/dosages_dom__dis.txt \
+ $(testresultsdir)/dosages_excl__dis.txt \
+ $(testresultsdir)/dosages_excl_add__dis.txt \
+ $(testresultsdir)/dosages_excl_dom__dis.txt \
+ $(testresultsdir)/dosages_excl_myadd__dis.txt \
+ $(testresultsdir)/dosages_excl_mylin__dis.txt \
+ $(testresultsdir)/dosages_excl_res__dis.txt \
+ $(testresultsdir)/dosages_myadd__dis.txt \
+ $(testresultsdir)/dosages_mylin__dis.txt \
+ $(testresultsdir)/dosages_res__dis.txt \
+ $(testresultsdir)/multi_inter_011_dis.txt \
+ $(testresultsdir)/multi_inter_0_dis.txt \
+ $(testresultsdir)/multi_inter_10_dis.txt \
+ $(testresultsdir)/multi_inter_11_dis.txt \
+ $(testresultsdir)/multi_inter_1RR_dis.txt \
+ $(testresultsdir)/multi_inter_1_dis.txt \
+ $(testresultsdir)/multi_inter_R0_dis.txt \
+ $(testresultsdir)/multi_inter_R1_dis.txt \
+ $(testresultsdir)/multi_inter_R_dis.txt \
+ $(testresultsdir)/multi_inter_add_011_dis.txt \
+ $(testresultsdir)/multi_inter_add_0_dis.txt \
+ $(testresultsdir)/multi_inter_add_10_dis.txt \
+ $(testresultsdir)/multi_inter_add_11_dis.txt \
+ $(testresultsdir)/multi_inter_add_1RR_dis.txt \
+ $(testresultsdir)/multi_inter_add_1_dis.txt \
+ $(testresultsdir)/multi_inter_add_R0_dis.txt \
+ $(testresultsdir)/multi_inter_add_R1_dis.txt \
+ $(testresultsdir)/multi_inter_add_R_dis.txt \
+ $(testresultsdir)/multi_inter_dom_011_dis.txt \
+ $(testresultsdir)/multi_inter_dom_0_dis.txt \
+ $(testresultsdir)/multi_inter_dom_10_dis.txt \
+ $(testresultsdir)/multi_inter_dom_11_dis.txt \
+ $(testresultsdir)/multi_inter_dom_1RR_dis.txt \
+ $(testresultsdir)/multi_inter_dom_1_dis.txt \
+ $(testresultsdir)/multi_inter_dom_R0_dis.txt \
+ $(testresultsdir)/multi_inter_dom_R1_dis.txt \
+ $(testresultsdir)/multi_inter_dom_R_dis.txt \
+ $(testresultsdir)/multi_inter_keep_R0_dis.txt \
+ $(testresultsdir)/multi_inter_keep_RR_dis.txt \
+ $(testresultsdir)/multi_inter_keep_R_dis.txt \
+ $(testresultsdir)/multi_inter_keep_add_R0_dis.txt \
+ $(testresultsdir)/multi_inter_keep_add_RR_dis.txt \
+ $(testresultsdir)/multi_inter_keep_add_R_dis.txt \
+ $(testresultsdir)/multi_inter_keep_dom_R0_dis.txt \
+ $(testresultsdir)/multi_inter_keep_dom_RR_dis.txt \
+ $(testresultsdir)/multi_inter_keep_dom_R_dis.txt \
+ $(testresultsdir)/multi_inter_keep_myadd_R0_dis.txt \
+ $(testresultsdir)/multi_inter_keep_myadd_RR_dis.txt \
+ $(testresultsdir)/multi_inter_keep_myadd_R_dis.txt \
+ $(testresultsdir)/multi_inter_keep_mylin_R0_dis.txt \
+ $(testresultsdir)/multi_inter_keep_mylin_RR_dis.txt \
+ $(testresultsdir)/multi_inter_keep_mylin_R_dis.txt \
+ $(testresultsdir)/multi_inter_keep_res_R0_dis.txt \
+ $(testresultsdir)/multi_inter_keep_res_RR_dis.txt \
+ $(testresultsdir)/multi_inter_keep_res_R_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_011_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_0_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_10_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_11_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_1RR_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_1_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_R0_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_R1_dis.txt \
+ $(testresultsdir)/multi_inter_myadd_R_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_011_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_0_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_10_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_11_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_1RR_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_1_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_R0_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_R1_dis.txt \
+ $(testresultsdir)/multi_inter_mylin_R_dis.txt \
+ $(testresultsdir)/multi_inter_res_011_dis.txt \
+ $(testresultsdir)/multi_inter_res_0_dis.txt \
+ $(testresultsdir)/multi_inter_res_10_dis.txt \
+ $(testresultsdir)/multi_inter_res_11_dis.txt \
+ $(testresultsdir)/multi_inter_res_1RR_dis.txt \
+ $(testresultsdir)/multi_inter_res_1_dis.txt \
+ $(testresultsdir)/multi_inter_res_R0_dis.txt \
+ $(testresultsdir)/multi_inter_res_R1_dis.txt \
+ $(testresultsdir)/multi_inter_res_R_dis.txt \
+ $(testresultsdir)/normal_dis.txt \
+ $(testresultsdir)/single_inter_011_dis.txt \
+ $(testresultsdir)/single_inter_0_dis.txt \
+ $(testresultsdir)/single_inter_10_dis.txt \
+ $(testresultsdir)/single_inter_11_dis.txt \
+ $(testresultsdir)/single_inter_1RR_dis.txt \
+ $(testresultsdir)/single_inter_1_dis.txt \
+ $(testresultsdir)/single_inter_R0_dis.txt \
+ $(testresultsdir)/single_inter_R1_dis.txt \
+ $(testresultsdir)/single_inter_R_dis.txt \
+ $(testresultsdir)/single_inter_add_011_dis.txt \
+ $(testresultsdir)/single_inter_add_0_dis.txt \
+ $(testresultsdir)/single_inter_add_10_dis.txt \
+ $(testresultsdir)/single_inter_add_11_dis.txt \
+ $(testresultsdir)/single_inter_add_1RR_dis.txt \
+ $(testresultsdir)/single_inter_add_1_dis.txt \
+ $(testresultsdir)/single_inter_add_R0_dis.txt \
+ $(testresultsdir)/single_inter_add_R1_dis.txt \
+ $(testresultsdir)/single_inter_add_R_dis.txt \
+ $(testresultsdir)/single_inter_dom_011_dis.txt \
+ $(testresultsdir)/single_inter_dom_0_dis.txt \
+ $(testresultsdir)/single_inter_dom_10_dis.txt \
+ $(testresultsdir)/single_inter_dom_11_dis.txt \
+ $(testresultsdir)/single_inter_dom_1RR_dis.txt \
+ $(testresultsdir)/single_inter_dom_1_dis.txt \
+ $(testresultsdir)/single_inter_dom_R0_dis.txt \
+ $(testresultsdir)/single_inter_dom_R1_dis.txt \
+ $(testresultsdir)/single_inter_dom_R_dis.txt \
+ $(testresultsdir)/single_inter_keep_R0_dis.txt \
+ $(testresultsdir)/single_inter_keep_RR_dis.txt \
+ $(testresultsdir)/single_inter_keep_R_dis.txt \
+ $(testresultsdir)/single_inter_keep_add_R0_dis.txt \
+ $(testresultsdir)/single_inter_keep_add_RR_dis.txt \
+ $(testresultsdir)/single_inter_keep_add_R_dis.txt \
+ $(testresultsdir)/single_inter_keep_dom_R0_dis.txt \
+ $(testresultsdir)/single_inter_keep_dom_RR_dis.txt \
+ $(testresultsdir)/single_inter_keep_dom_R_dis.txt \
+ $(testresultsdir)/single_inter_keep_myadd_R0_dis.txt \
+ $(testresultsdir)/single_inter_keep_myadd_RR_dis.txt \
+ $(testresultsdir)/single_inter_keep_myadd_R_dis.txt \
+ $(testresultsdir)/single_inter_keep_mylin_R0_dis.txt \
+ $(testresultsdir)/single_inter_keep_mylin_RR_dis.txt \
+ $(testresultsdir)/single_inter_keep_mylin_R_dis.txt \
+ $(testresultsdir)/single_inter_keep_res_R0_dis.txt \
+ $(testresultsdir)/single_inter_keep_res_RR_dis.txt \
+ $(testresultsdir)/single_inter_keep_res_R_dis.txt \
+ $(testresultsdir)/single_inter_myadd_011_dis.txt \
+ $(testresultsdir)/single_inter_myadd_0_dis.txt \
+ $(testresultsdir)/single_inter_myadd_10_dis.txt \
+ $(testresultsdir)/single_inter_myadd_11_dis.txt \
+ $(testresultsdir)/single_inter_myadd_1RR_dis.txt \
+ $(testresultsdir)/single_inter_myadd_1_dis.txt \
+ $(testresultsdir)/single_inter_myadd_R0_dis.txt \
+ $(testresultsdir)/single_inter_myadd_R1_dis.txt \
+ $(testresultsdir)/single_inter_myadd_R_dis.txt \
+ $(testresultsdir)/single_inter_mylin_011_dis.txt \
+ $(testresultsdir)/single_inter_mylin_0_dis.txt \
+ $(testresultsdir)/single_inter_mylin_10_dis.txt \
+ $(testresultsdir)/single_inter_mylin_11_dis.txt \
+ $(testresultsdir)/single_inter_mylin_1RR_dis.txt \
+ $(testresultsdir)/single_inter_mylin_1_dis.txt \
+ $(testresultsdir)/single_inter_mylin_R0_dis.txt \
+ $(testresultsdir)/single_inter_mylin_R1_dis.txt \
+ $(testresultsdir)/single_inter_mylin_R_dis.txt \
+ $(testresultsdir)/single_inter_res_011_dis.txt \
+ $(testresultsdir)/single_inter_res_0_dis.txt \
+ $(testresultsdir)/single_inter_res_10_dis.txt \
+ $(testresultsdir)/single_inter_res_11_dis.txt \
+ $(testresultsdir)/single_inter_res_1RR_dis.txt \
+ $(testresultsdir)/single_inter_res_1_dis.txt \
+ $(testresultsdir)/single_inter_res_R0_dis.txt \
+ $(testresultsdir)/single_inter_res_R1_dis.txt \
+ $(testresultsdir)/single_inter_res_R_dis.txt
CLEANFILES += $(cleanfiles_tests)
More information about the Genabel-commits
mailing list