Mercurial > hg-stable

changeset 22293:a970a5c15b43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix p4 tests so they use separate ports and can be run in parallel
author Mads Kiilerich <madski@unity3d.com>
date Mon, 25 Aug 2014 03:27:51 +0200
parents 102f0e926668
children 754f208ce21d
files tests/test-convert-p4-filetypes.t tests/test-convert-p4.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-p4-filetypes.t	Tue Aug 26 22:03:30 2014 +0200
+++ b/tests/test-convert-p4-filetypes.t	Mon Aug 25 03:27:51 2014 +0200
@@ -8,7 +8,7 @@
   $ P4AUDIT=$P4ROOT/audit; export P4AUDIT
   $ P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
   $ P4LOG=$P4ROOT/log; export P4LOG
-  $ P4PORT=localhost:16661; export P4PORT
+  $ P4PORT=localhost:$HGPORT; export P4PORT
   $ P4DEBUG=1; export P4DEBUG
   $ P4CHARSET=utf8; export P4CHARSET
 
--- a/tests/test-convert-p4.t	Tue Aug 26 22:03:30 2014 +0200
+++ b/tests/test-convert-p4.t	Mon Aug 25 03:27:51 2014 +0200
@@ -8,7 +8,7 @@
   $ P4AUDIT=$P4ROOT/audit; export P4AUDIT
   $ P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
   $ P4LOG=$P4ROOT/log; export P4LOG
-  $ P4PORT=localhost:16661; export P4PORT
+  $ P4PORT=localhost:$HGPORT; export P4PORT
   $ P4DEBUG=1; export P4DEBUG
 
 start the p4 server