couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r669670 - in /incubator/couchdb/branches/runtimeconfig: ./ src/ src/couchdb/test/ test/
Date Thu, 19 Jun 2008 20:11:52 GMT
Author: nslater
Date: Thu Jun 19 13:11:51 2008
New Revision: 669670

URL: http://svn.apache.org/viewvc?rev=669670&view=rev
Log:
integrate tests into build

Added:
    incubator/couchdb/branches/runtimeconfig/test/Makefile.am
      - copied, changed from r669662, incubator/couchdb/branches/runtimeconfig/test/Makefile
    incubator/couchdb/branches/runtimeconfig/test/couch_config_test.erl
      - copied unchanged from r669662, incubator/couchdb/branches/runtimeconfig/src/couchdb/test/couch_config_test.erl
    incubator/couchdb/branches/runtimeconfig/test/couch_config_writer_test.erl
      - copied unchanged from r669662, incubator/couchdb/branches/runtimeconfig/src/couchdb/test/couch_config_writer_test.erl
    incubator/couchdb/branches/runtimeconfig/test/runner.erl
      - copied, changed from r669662, incubator/couchdb/branches/runtimeconfig/test/test_runner.erl
    incubator/couchdb/branches/runtimeconfig/test/runner.sh   (with props)
Removed:
    incubator/couchdb/branches/runtimeconfig/src/Makefile.am
    incubator/couchdb/branches/runtimeconfig/src/couchdb/test/
    incubator/couchdb/branches/runtimeconfig/test/Makefile
    incubator/couchdb/branches/runtimeconfig/test/test_runner.erl
Modified:
    incubator/couchdb/branches/runtimeconfig/Makefile.am
    incubator/couchdb/branches/runtimeconfig/configure.ac

Modified: incubator/couchdb/branches/runtimeconfig/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/Makefile.am?rev=669670&r1=669669&r2=669670&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/Makefile.am Thu Jun 19 13:11:51 2008
@@ -10,7 +10,7 @@
 ## License for the specific language governing permissions and limitations
 ## under the License.
 
-SUBDIRS = bin etc src share var
+SUBDIRS = bin etc src/couchdb src/mochiweb share test var
 
 localdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz
 

Modified: incubator/couchdb/branches/runtimeconfig/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/configure.ac?rev=669670&r1=669669&r2=669670&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/configure.ac (original)
+++ incubator/couchdb/branches/runtimeconfig/configure.ac Thu Jun 19 13:11:51 2008
@@ -242,7 +242,7 @@
 AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
 AC_CONFIG_FILES([src/couchdb/Makefile])
 AC_CONFIG_FILES([src/mochiweb/Makefile])
-AC_CONFIG_FILES([src/Makefile])
+AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([var/Makefile])
 
 AC_OUTPUT

Copied: incubator/couchdb/branches/runtimeconfig/test/Makefile.am (from r669662, incubator/couchdb/branches/runtimeconfig/test/Makefile)
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/test/Makefile.am?p2=incubator/couchdb/branches/runtimeconfig/test/Makefile.am&p1=incubator/couchdb/branches/runtimeconfig/test/Makefile&r1=669662&r2=669670&rev=669670&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/test/Makefile (original)
+++ incubator/couchdb/branches/runtimeconfig/test/Makefile.am Thu Jun 19 13:11:51 2008
@@ -1,6 +1,20 @@
-# depends on ../src/*/*.beam and ../src/couchdb/test/*.beam
-test: test_runner.beam
-	@erl -noshell -pa ../src/couchdb  -pa ../src/mochiweb -eval "test_runner:run()"
+## Licensed under the Apache License, Version 2.0 (the "License"); you may not
+## use this file except in compliance with the License.  You may obtain a copy
+## of the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+## License for the specific language governing permissions and limitations
+## under the License.
 
-%.beam: %.erl
-	erlc $<
\ No newline at end of file
+TESTS = runner.sh
+
+check_PROGRAMS = runner.beam
+
+CLEANFILES = test.ini
+
+runner.beam: runner.erl
+	$(ERLC) $<

Copied: incubator/couchdb/branches/runtimeconfig/test/runner.erl (from r669662, incubator/couchdb/branches/runtimeconfig/test/test_runner.erl)
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/test/runner.erl?p2=incubator/couchdb/branches/runtimeconfig/test/runner.erl&p1=incubator/couchdb/branches/runtimeconfig/test/test_runner.erl&r1=669662&r2=669670&rev=669670&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/test/test_runner.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/test/runner.erl Thu Jun 19 13:11:51 2008
@@ -1,9 +1,8 @@
--module(test_runner).
+-module(runner).
 
 -export([run/0]).
--include("../src/couchdb/test/couch_config_test.erl").
--include("../src/couchdb/test/couch_config_writer_test.erl").
-
+-include("couch_config_test.erl").
+-include("couch_config_writer_test.erl").
 
 %% Test Runner
 run() ->
@@ -17,14 +16,14 @@
 
     % CouchDB tests
     Tests = lists:flatten([
-        couch_config_test(), 
+        couch_config_test(),
         couch_config_writer_test()
     ]),
     run_tests(Tests),
-    
+
     % we're done, get out of here
     halt().
-    
+
 run_test(TestFun) ->
     io:format("  ~s        ", [proplists:get_value(
                                  name,

Added: incubator/couchdb/branches/runtimeconfig/test/runner.sh
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/test/runner.sh?rev=669670&view=auto
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/test/runner.sh (added)
+++ incubator/couchdb/branches/runtimeconfig/test/runner.sh Thu Jun 19 13:11:51 2008
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+erl -noshell -pa ../src/couchdb -pa ../src/mochiweb -eval "runner:run()"

Propchange: incubator/couchdb/branches/runtimeconfig/test/runner.sh
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message