From 708ad7d7dbfc8f8d52312c3989f86b183e12af45 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <github@kheafield.com>
Date: Fri, 11 May 2012 20:31:57 -0400
Subject: Fix relative paths in tests.

---
 decoder/Jamfile         | 2 +-
 decoder/grammar_test.cc | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'decoder')

diff --git a/decoder/Jamfile b/decoder/Jamfile
index d7d42f28..f8112cae 100644
--- a/decoder/Jamfile
+++ b/decoder/Jamfile
@@ -65,7 +65,7 @@ lib cdec_lib :
 
 exe cdec : cdec.cc cdec_lib ;
 
-all_tests [ glob *_test.cc : cfg_test.cc ] : cdec_lib ;
+all_tests [ glob *_test.cc : cfg_test.cc ] : cdec_lib : <testing.arg>$(TOP)/decoder/test_data ;
 
 install legacy : cdec
   : <location>$(TOP)/cdec <install-type>EXE <install-dependencies>on <link>shared:<dll-path>$(TOP)/cdec <link>shared:<install-type>LIB ;
diff --git a/decoder/grammar_test.cc b/decoder/grammar_test.cc
index e1a94709..4500490a 100644
--- a/decoder/grammar_test.cc
+++ b/decoder/grammar_test.cc
@@ -17,7 +17,8 @@ using namespace std;
 
 struct GrammarTest {
   GrammarTest() {
-    Weights::InitFromFile("test_data/weights.gt", &wts);
+    std::string path(boost::unit_test::framework::master_test_suite().argc == 2 ? boost::unit_test::framework::master_test_suite().argv[1] : "test_data");
+    Weights::InitFromFile(path + "/weights.gt", &wts);
   }
   vector<weight_t> wts;
 };
@@ -40,7 +41,8 @@ BOOST_AUTO_TEST_CASE(TestTextGrammar) {
 }
 
 BOOST_AUTO_TEST_CASE(TestTextGrammarFile) {
-  GrammarPtr g(new TextGrammar("./test_data/grammar.prune"));
+  std::string path(boost::unit_test::framework::master_test_suite().argc == 2 ? boost::unit_test::framework::master_test_suite().argv[1] : "test_data");
+  GrammarPtr g(new TextGrammar(path + "/grammar.prune"));
   vector<GrammarPtr> grammars(1, g);
 
   LatticeArc a(TD::Convert("ein"), 0.0, 1);
-- 
cgit v1.2.3