Browse Source

fixed some file paths so that it will work with distcheck.
should be quite trivial and is related to buildbot failure, so will merge skipping review.

JINMEI Tatuya 14 years ago
parent
commit
0de71f9b34
1 changed files with 6 additions and 6 deletions
  1. 6 6
      src/bin/auth/tests/command_unittest.cc

+ 6 - 6
src/bin/auth/tests/command_unittest.cc

@@ -127,9 +127,9 @@ zoneChecks(AuthSrv& server) {
 
 void
 configureZones(AuthSrv& server) {
-    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_BUILDDIR "/test1.zone.in "
+    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_DIR "/test1.zone.in "
                         TEST_DATA_BUILDDIR "/test1.zone.copied"));
-    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_BUILDDIR "/test2.zone.in "
+    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_DIR "/test2.zone.in "
                         TEST_DATA_BUILDDIR "/test2.zone.copied"));
     configureAuthServer(server, Element::fromJSON(
                             "{\"datasources\": "
@@ -168,10 +168,10 @@ newZoneChecks(AuthSrv& server) {
 TEST_F(AuthConmmandTest, loadZone) {
     configureZones(server);
 
-    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_BUILDDIR
+    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_DIR
                         "/test1-new.zone.in "
                         TEST_DATA_BUILDDIR "/test1.zone.copied"));
-    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_BUILDDIR
+    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_DIR
                         "/test2-new.zone.in "
                         TEST_DATA_BUILDDIR "/test2.zone.copied"));
 
@@ -185,7 +185,7 @@ TEST_F(AuthConmmandTest, loadZone) {
 TEST_F(AuthConmmandTest, loadBrokenZone) {
     configureZones(server);
 
-    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_BUILDDIR
+    ASSERT_EQ(0, system(INSTALL_PROG " " TEST_DATA_DIR
                         "/test1-broken.zone.in "
                         TEST_DATA_BUILDDIR "/test1.zone.copied"));
     result = execAuthServerCommand(server, "loadzone",
@@ -199,7 +199,7 @@ TEST_F(AuthConmmandTest, loadUnreadableZone) {
     configureZones(server);
 
     // install the zone file as unreadable
-    ASSERT_EQ(0, system(INSTALL_PROG " -m 000 " TEST_DATA_BUILDDIR
+    ASSERT_EQ(0, system(INSTALL_PROG " -m 000 " TEST_DATA_DIR
                         "/test1.zone.in "
                         TEST_DATA_BUILDDIR "/test1.zone.copied"));
     result = execAuthServerCommand(server, "loadzone",