diff options
| author | Alexander Shorin <kxepal@apache.org> | 2014-06-23 00:33:26 +0400 |
|---|---|---|
| committer | Alexander Shorin <kxepal@apache.org> | 2014-06-23 03:31:26 +0400 |
| commit | 033b1f1dfa5d74813e63db36fede3aa120095438 (patch) | |
| tree | 9ff320479b05c66bd55e2a06e9364069de52a1dd | |
| parent | 1330c2e3fbf4b126ffa08904232ee5eed839a73e (diff) | |
| download | couchdb-033b1f1dfa5d74813e63db36fede3aa120095438.tar.gz | |
Move couch_eunit.hrl.in to include directory
Because include path "." has higher priority than any other custom
paths, generated during `configure` phase couch_eunit.hrl contains
build and source paths which aren't used for `make distcheck` causing
various failures.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | test/couchdb/Makefile.am | 5 | ||||
| -rw-r--r-- | test/couchdb/include/couch_eunit.hrl.in (renamed from test/couchdb/couch_eunit.hrl.in) | 0 | ||||
| -rw-r--r-- | test/couchdb/run.in | 7 |
5 files changed, 9 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 0f8498cbd..236aa5dc1 100644 --- a/.gitignore +++ b/.gitignore @@ -129,7 +129,7 @@ stamp-h1 test/.deps/ test/bench/run test/couchdb/run -test/couchdb/couch_eunit.hrl +test/couchdb/include/couch_eunit.hrl test/couchdb/fixtures/.deps/ test/javascript/run test/javascript/run_js_tests.sh diff --git a/configure.ac b/configure.ac index 36b765a65..5aba06af9 100644 --- a/configure.ac +++ b/configure.ac @@ -754,7 +754,7 @@ AC_CONFIG_FILES([test/Makefile]) AC_CONFIG_FILES([test/bench/Makefile]) AC_CONFIG_FILES([test/couchdb/run]) AC_CONFIG_FILES([test/couchdb/Makefile]) -AC_CONFIG_FILES([test/couchdb/couch_eunit.hrl]) +AC_CONFIG_FILES([test/couchdb/include/couch_eunit.hrl]) AC_CONFIG_FILES([test/couchdb/fixtures/Makefile]) AC_CONFIG_FILES([test/javascript/Makefile]) AC_CONFIG_FILES([test/view_server/Makefile]) diff --git a/test/couchdb/Makefile.am b/test/couchdb/Makefile.am index b51bdb1dd..2de2a9025 100644 --- a/test/couchdb/Makefile.am +++ b/test/couchdb/Makefile.am @@ -17,7 +17,8 @@ noinst_SCRIPTS = run all: mkdir -p ebin mkdir -p temp - ${ERLC} -oebin test_request.erl test_web.erl + ${ERLC} -Wall -I$(top_srcdir)/src -I$(top_srcdir)/test/couchdb/include \ + -o ebin/ test_request.erl test_web.erl chmod +x run chmod +x fixtures/*.sh chmod -x fixtures/os_daemon_bad_perm.sh @@ -54,7 +55,7 @@ eunit_files = \ json_stream_parse_tests.erl \ test_request.erl \ test_web.erl \ - couch_eunit.hrl + include/couch_eunit.hrl fixture_files = \ fixtures/couch_config_tests_1.ini \ diff --git a/test/couchdb/couch_eunit.hrl.in b/test/couchdb/include/couch_eunit.hrl.in index ff080e1f4..ff080e1f4 100644 --- a/test/couchdb/couch_eunit.hrl.in +++ b/test/couchdb/include/couch_eunit.hrl.in diff --git a/test/couchdb/run.in b/test/couchdb/run.in index 2982ec351..2405f6321 100644 --- a/test/couchdb/run.in +++ b/test/couchdb/run.in @@ -16,8 +16,8 @@ -define(BUILDDIR, "@abs_top_builddir@"). -define(SOURCEDIR, "@abs_top_srcdir@"). --define(TESTS_EBIN, filename:join([?BUILDDIR, "test", "couchdb", "ebin"])). --define(TESTS_TEMP, filename:join([?BUILDDIR, "test", "couchdb", "temp"])). +-define(TESTS_EBIN, filename:join([?BUILDDIR, "test", "couchdb", "ebin", ""])). +-define(TESTS_TEMP, filename:join([?BUILDDIR, "test", "couchdb", "temp", ""])). main([]) -> io:fwrite("Path to test file or directory wasn't specified.~n"), @@ -79,7 +79,8 @@ compile(Files) -> fun(File)-> io:fwrite("compile ~p~n", [File]), Opts = [report, verbose, {outdir, ?TESTS_EBIN}, - {i, filename:join([?BUILDDIR, "test", "couchdb"])}, + {i, filename:join([?BUILDDIR, "test", "couchdb", + "include"])}, {i, filename:join([?SOURCEDIR, "src"])}], {ok, Mod} = compile:file(File, Opts), Mod |