From 850ff04a9d67a47c1e863c83ef3c322212b79699 Mon Sep 17 00:00:00 2001 From: Barry Haddow Date: Thu, 24 May 2012 22:11:47 +0100 Subject: [PATCH] Fix globs so that it runs all tests (except for extract tests and apparently broken chart kenlm test) --- regression-testing/Jamfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/regression-testing/Jamfile b/regression-testing/Jamfile index 7fc98bd14..6afe1cf97 100644 --- a/regression-testing/Jamfile +++ b/regression-testing/Jamfile @@ -15,18 +15,18 @@ if $(with-regtest) { actions reg_test_decode { $(TOP)/regression-testing/run-single-test.perl --decoder=$(>) --test=$(<:B) --data-dir=$(with-regtest) --test-dir=$(TESTS) && touch $(<) } - reg_test phrase : [ glob tests/phrase.* ] : ../moses-cmd/src//moses : @reg_test_decode ; - reg_test chart : chart.target-syntax chart.target-syntax.ondisk chart.hierarchical chart.hierarchical-withsrilm chart.hierarchical.ondisk : ../moses-chart-cmd/src//moses_chart : @reg_test_decode ; + reg_test phrase : [ glob $(TESTS)/phrase.* ] : ../moses-cmd/src//moses : @reg_test_decode ; + reg_test chart : [ glob $(TESTS)/chart.* : $(TESTS)/chart.hierarchical-withkenlm ] : ../moses-chart-cmd/src//moses_chart : @reg_test_decode ; actions reg_test_score { $(TOP)/regression-testing/run-test-scorer.perl --scorer=$(>) --test=$(<:B) --data-dir=$(with-regtest) --test-dir=$(TESTS) && touch $(<) } - reg_test score : [ glob tests/score.* ] : ../scripts/training/phrase-extract//score : @reg_test_score ; + reg_test score : [ glob $(TESTS)/score.* ] : ../scripts/training/phrase-extract//score : @reg_test_score ; actions reg_test_mert { $(TOP)/regression-testing/run-test-mert.perl --mert-dir=$(TOP)/mert --test=$(<:B) --data-dir=$(with-regtest) --test-dir=$(TESTS) && touch $(<) } - reg_test mert : [ glob tests/mert.* ] : ../mert//legacy : @reg_test_mert ; - - alias all : phrase chart score mert ; + reg_test mert : [ glob $(TESTS)/mert.* ] : ../mert//legacy : @reg_test_mert ; + + alias all : phrase chart mert score ; }