couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject [1/2] git commit: added a secret environment variable to help me work
Date Sat, 29 Sep 2012 21:51:51 GMT
Updated Branches:
  refs/heads/docs 9e4ca497d -> a0d2f837a


added a secret environment variable to help me work


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

Branch: refs/heads/docs
Commit: a0d2f837aa8a2c092c6932136bfe519ce7896bed
Parents: 76acc48
Author: Noah Slater <nslater@apache.org>
Authored: Sat Sep 29 22:51:34 2012 +0100
Committer: Noah Slater <nslater@apache.org>
Committed: Sat Sep 29 22:51:34 2012 +0100

----------------------------------------------------------------------
 Makefile.am                      |   10 ++++++++++
 configure.ac                     |   16 +++++++++++++---
 src/couch_mrview/Makefile.am     |    2 ++
 src/couch_replicator/Makefile.am |    2 ++
 4 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a0d2f837/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index cc20c50..49901a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,17 +91,24 @@ THANKS.gz: $(top_srcdir)/THANKS
 	@rm $(top_builddir)/THANKS.tmp
 
 check: dev check-js
+if RUN_TESTS
 	$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
+endif
 
 check-js: dev
+if RUN_TESTS
 if USE_CURL
 	$(top_builddir)/test/javascript/run
 endif
+endif
 
 check-etap: dev
+if RUN_TESTS
 	$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
+endif
 
 cover: dev
+if RUN_TESTS
 	rm -f cover/*.coverdata
 	COVER=1 COVER_BIN=./src/couchdb/ $(top_builddir)/test/etap/run
 	SRC=./src/couchdb/ \
@@ -109,8 +116,10 @@ cover: dev
 	    -pa src/etap \
 	    -eval 'etap_report:create()' \
 	    -s init stop > /dev/null 2>&1
+endif
 
 dev: all
+if RUN_TESTS
 	@echo "This command is intended for developers to use;"
 	@echo "it creates development ini files as well as a"
 	@echo "$(top_builddir)/tmp structure for development runtime files."
@@ -120,6 +129,7 @@ dev: all
 	mkdir -p $(top_builddir)/tmp/lib
 	mkdir -p $(top_builddir)/tmp/log
 	mkdir -p $(top_builddir)/tmp/run/couchdb
+endif
 
 install-data-hook:
 	@echo

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a0d2f837/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 7224b85..2e79a93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,10 @@ dnl WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
the
 dnl License for the specific language governing permissions and limitations
 dnl under the License.
 
-AC_INIT([LOCAL_PACKAGE_NAME], [LOCAL_VERSION], [LOCAL_BUG_URI],
+AC_INIT(
+    [LOCAL_PACKAGE_NAME],
+    [LOCAL_VERSION],
+    [LOCAL_BUG_URI],
     [LOCAL_PACKAGE_TARNAME])
 
 AC_PREREQ([2.59])
@@ -324,7 +327,6 @@ AC_SUBST(JS_LIBS)
 LIBS="$OLD_LIBS"
 CPPFLAGS="$OLD_CPPFLAGS"
 
-
 AC_ARG_WITH([win32-icu-binaries], [AC_HELP_STRING([--with-win32-icu-binaries=PATH],
     [set PATH to the Win32 native ICU binaries directory])], [
     ICU_CPPFLAGS="-I$withval/include"
@@ -373,7 +375,6 @@ case "$(uname -s)" in
   ;;
 esac
 
-
 erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)."
 
 version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'`"
@@ -488,6 +489,15 @@ else
     fi
 fi
 
+# Secret environment variable to skip tests while working on the build system
+if test -n "$SKIP_TESTS"; then
+    run_tests=no
+else
+    run_tests=yes
+fi
+
+AM_CONDITIONAL([RUN_TESTS], [test x${run_tests} = xyes])
+
 AM_CONDITIONAL([INIT], [test x${init_enabled} = xtrue])
 AM_CONDITIONAL([LAUNCHD], [test x${launchd_enabled} = xtrue])
 AM_CONDITIONAL([HELP2MAN], [test x${help2man_enabled} = xtrue])

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a0d2f837/src/couch_mrview/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couch_mrview/Makefile.am b/src/couch_mrview/Makefile.am
index b544cb7..0360c2a 100644
--- a/src/couch_mrview/Makefile.am
+++ b/src/couch_mrview/Makefile.am
@@ -57,7 +57,9 @@ EXTRA_DIST = $(include_files) $(source_files) $(test_files)
 CLEANFILES = $(compiled_files)
 
 check:
+if RUN_TESTS
 	$(abs_top_builddir)/test/etap/run $(abs_top_srcdir)/src/couch_mrview/test
+endif
 
 ebin/%.app: src/%.app.src
 	@mkdir -p ebin/

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a0d2f837/src/couch_replicator/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couch_replicator/Makefile.am b/src/couch_replicator/Makefile.am
index 746a62f..75326ab 100644
--- a/src/couch_replicator/Makefile.am
+++ b/src/couch_replicator/Makefile.am
@@ -60,7 +60,9 @@ EXTRA_DIST = $(include_files) $(source_files) $(test_files)
 CLEANFILES = $(compiled_files)
 
 check:
+if RUN_TESTS
 	$(abs_top_builddir)/test/etap/run $(abs_top_srcdir)/src/couch_replicator/test
+endif
 
 ebin/%.app: src/%.app.src
 	@mkdir -p ebin/


Mime
View raw message