couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject git commit: Fix JS CLI tests for make distcheck
Date Wed, 25 Apr 2012 23:11:37 GMT
Updated Branches:
  refs/heads/master bdb50bef5 -> 025031025


Fix JS CLI tests for make distcheck

The default_dev.ini and local_dev.ini files are build artefacts and thus
need to be found in the build directory instead of the source directory.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/02503102
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/02503102
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/02503102

Branch: refs/heads/master
Commit: 0250310257b2f280b063f748c06c0dd9f5eaacb1
Parents: bdb50be
Author: Paul Joseph Davis <davisp@apache.org>
Authored: Wed Apr 25 18:10:54 2012 -0500
Committer: Paul Joseph Davis <davisp@apache.org>
Committed: Wed Apr 25 18:10:54 2012 -0500

----------------------------------------------------------------------
 test/javascript/run.tpl |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/02503102/test/javascript/run.tpl
----------------------------------------------------------------------
diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
index 3cf7e69..d163f9f 100644
--- a/test/javascript/run.tpl
+++ b/test/javascript/run.tpl
@@ -13,6 +13,7 @@
 # the License.
 
 SRC_DIR=%abs_top_srcdir%
+BUILD_DIR=%abs_top_builddir%
 SCRIPT_DIR=$SRC_DIR/share/www/script
 JS_TEST_DIR=$SRC_DIR/test/javascript
 
@@ -40,9 +41,9 @@ fi
 if [ -z $COUCHDB_NO_START ]; then
         make dev
 	./utils/run -b -r 1 -n \
-		-a $SRC_DIR/etc/couchdb/default_dev.ini \
+		-a $BUILD_DIR/etc/couchdb/default_dev.ini \
 		-a $SRC_DIR/test/random_port.ini \
-		-a $SRC_DIR/etc/couchdb/local_dev.ini
+		-a $BUILD_DIR/etc/couchdb/local_dev.ini
     RUN_PID=$!
     trap "./utils/run -d || kill $RUN_PID || exit 2" EXIT
 	sleep 1 # give it a sec


Mime
View raw message