[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 11c6a9bdb3dd4d24fda37cdcf8c904ad03294918

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_1 has been updated
       via  11c6a9bdb3dd4d24fda37cdcf8c904ad03294918 (commit)
      from  a83d7bc2f431931234f0d0a41206ceea92a78963 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 11c6a9bdb3dd4d24fda37cdcf8c904ad03294918
Author: Dan Scott <dan at coffeecode.net>
Date:   Thu Jul 28 15:49:12 2011 -0400

    Fix broken builds due to test that can't find its data
    
    LP 817699 reports a problem that began with commit
    e9cd992fa4dbf1013346336193cb7469ecee10a8, reintroducing a problem that
    had previously been resolved with commit
    f017d1261c369b9b5cc3c9cfc4f50d3cdf12a445. In short, tests can and are
    run from different directories, but a new test opened a file without
    making any allowance that the test might be run from anything other than
    the /test/ directory.
    
    This fix uses the dirname(__FILE__) approach to provide the appropriate
    relative directory for the test data, and enables the tests to be
    processed without dying.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/test/mfhd.t b/Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/test/mfhd.t
index d9ad34b..29ee865 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/test/mfhd.t
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/test/mfhd.t
@@ -66,7 +66,8 @@ while ($rec = testlib::load_MARC_rec($testdata, $testno++)) {
 close $testdata;
 
 # test: passthru_open_ended
-open($testdata, "<mfhddata2.txt") or die("Cannot open 'mfhddata2.txt': $!");
+my $testfile2 = dirname(__FILE__) . "/mfhddata2.txt";
+open($testdata, "<", $testfile2) or die("Cannot open '$testfile2': $!");
 
 $rec = MFHD->new(testlib::load_MARC_rec($testdata, $testno));
 my $rec2 = MFHD->new(testlib::load_MARC_rec($testdata, $testno));

-----------------------------------------------------------------------

Summary of changes:
 .../perlmods/lib/OpenILS/Utils/MFHD/test/mfhd.t    |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS