diff options
author | Hieu Hoang <hieuhoang@gmail.com> | 2012-11-13 01:12:01 +0400 |
---|---|---|
committer | Hieu Hoang <hieuhoang@gmail.com> | 2012-11-13 01:12:01 +0400 |
commit | 0bc0b853581bbdc00a3403edc69e76d02fbfde3a (patch) | |
tree | 39c2547f3904337033c338cc686eac9768f531ae /regression-testing | |
parent | 125fdbcff6bcebf793a033f984827e59f98f0788 (diff) |
resolved merge conflicts
Diffstat (limited to 'regression-testing')
-rw-r--r-- | regression-testing/Jamfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regression-testing/Jamfile b/regression-testing/Jamfile index 998e46317..16110ad29 100644 --- a/regression-testing/Jamfile +++ b/regression-testing/Jamfile @@ -24,8 +24,8 @@ if $(with-regtest) { actions reg_test_decode { $(TOP)/regression-testing/run-single-test.perl --decoder=$(>) --test=$(<:B) --data-dir=$(with-regtest) --test-dir=$(test-dir) && touch $(<) } - reg_test phrase : [ glob $(test-dir)/phrase.* ] : ../moses-cmd/src//moses : @reg_test_decode ; - reg_test chart : [ glob $(test-dir)/chart.* ] : ../moses-chart-cmd/src//moses_chart : @reg_test_decode ; + reg_test phrase : [ glob $(test-dir)/phrase.* ] : ../moses-cmd//moses : @reg_test_decode ; + reg_test chart : [ glob $(test-dir)/chart.* ] : ../moses-chart-cmd//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=$(test-dir) && touch $(<) |