From: Han-Wen Nienhuys Date: Thu, 28 Dec 2006 15:32:29 +0000 (+0100) Subject: fix flower test to actually work. X-Git-Tag: release/2.11.6-1~48 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=142473fac5bf93343924c1b1c2979040c606a5a5;p=lilypond.git fix flower test to actually work. --- 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"); + }