diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-12-28 16:32:29 +0100 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-12-28 16:32:29 +0100 |
| commit | 142473fac5bf93343924c1b1c2979040c606a5a5 (patch) | |
| tree | af62e7fe0857a9b01c4637129b69f387ba2418df | |
| parent | a1741dc78d0f4a71cd6790b4306fdcd618e5c40a (diff) | |
fix flower test to actually work.
| -rw-r--r-- | flower/GNUmakefile | 2 | ||||
| -rw-r--r-- | flower/test-file.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/flower/GNUmakefile b/flower/GNUmakefile index 5fe94f1f08..670aece45c 100644 --- a/flower/GNUmakefile +++ b/flower/GNUmakefile @@ -12,5 +12,5 @@ STEPMAKE_TEMPLATES=library c++ po test # test uses LILYPONDPREFIX LOCALSTEPMAKE_TEMPLATES=lilypond TEST_MODULE_LIBS = ../flower - +export top-src-dir include $(depth)/make/stepmake.make diff --git a/flower/test-file.cc b/flower/test-file.cc index 9057b3a9e2..177676f791 100644 --- a/flower/test-file.cc +++ b/flower/test-file.cc @@ -47,7 +47,7 @@ void file_find () File_path path; char cwd[PATH_MAX]; getcwd (cwd, PATH_MAX); - string ly_dir = string (getenv ("LILYPONDPREFIX")) + "/ly"; + string ly_dir = string (getenv ("top-src-dir")) + "/ly"; cout << ly_dir << endl; path.parse_path (string (1, PATHSEP) + ly_dir); string file_name = path.find (file, extensions); @@ -57,4 +57,5 @@ void file_find () file_name = path.find (file, extensions); cout << file_name << endl; BOOST_CHECK_EQUAL (file_name, ly_dir + "/init.ly"); + } |