[couchdb] branch fix-windows-testsuite updated (33f7342 -> 6ccfcda)

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a change to branch fix-windows-testsuite
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit 33f7342  Fix EUnit test suite on Windows
     new 6ccfcda  Fix EUnit test suite on Windows

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (33f7342)
            \
             N -- N -- N   refs/heads/fix-windows-testsuite (6ccfcda)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile.win | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb] 01/01: Fix EUnit test suite on Windows

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch fix-windows-testsuite
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 6ccfcda41702669cfe5f610ef8e0b86a57102b2a
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Sun Nov 5 22:10:57 2017 -0500

    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.
---
 Makefile.win                      | 5 ++++-
 src/couch/include/couch_eunit.hrl | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.win b/Makefile.win
index 4b1b546..874ddf4 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 8a1527b..8eb763a 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,

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.