diff options
author | Joan Touzet <joant@atypical.net> | 2017-11-05 22:10:57 -0500 |
---|---|---|
committer | Joan Touzet <wohali@users.noreply.github.com> | 2017-11-06 12:36:10 -0500 |
commit | 8e7acb724f7edfe3fbfbdc4ebe37c298eac0c699 (patch) | |
tree | 30f383bc933a954b28692eafd5872d8f9e0a902a | |
parent | 436b402721b26575e989f04db61c9edbcfb168f5 (diff) | |
download | couchdb-8e7acb724f7edfe3fbfbdc4ebe37c298eac0c699.tar.gz |
Fix EUnit test suite on Windows
1. You cannot create file names with " in them on Windows...
2. When you update Makefile, you have to update Makefile.win sometimes too.
-rw-r--r-- | Makefile.win | 5 | ||||
-rw-r--r-- | src/couch/include/couch_eunit.hrl | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.win b/Makefile.win index 4b1b54678..874ddf411 100644 --- a/Makefile.win +++ b/Makefile.win @@ -102,7 +102,10 @@ else @copy test\javascript\tests\lorem*.txt src\fauxton\dist\release\test endif -@rmdir /s/q dev\lib - @python dev\run -n 1 -q --with-admin-party-please -c startup_jitter=0 python test\javascript\run $(suites) + @python dev\run -n 1 -q --with-admin-party-please \ + --enable-erlang-views \ + -c startup_jitter=0 \ + python test\javascript\run $(suites) .PHONY: check-qs diff --git a/src/couch/include/couch_eunit.hrl b/src/couch/include/couch_eunit.hrl index 8a1527bcc..8eb763aff 100644 --- a/src/couch/include/couch_eunit.hrl +++ b/src/couch/include/couch_eunit.hrl @@ -42,7 +42,7 @@ fun() -> A = integer_to_list(couch_util:unique_monotonic_integer()), N = node(), - FileName = lists:flatten(io_lib:format("~p-~p", [N, A])), + FileName = lists:flatten(io_lib:format("~p-~s", [N, A])), filename:join([?TEMPDIR, FileName]) end). -define(tempdb, |