Patchwork [2,of,3] tests: fix p4 tests so they use separate ports and can be run in parallel

login
register
mail settings
Submitter Mads Kiilerich
Date Aug. 25, 2014, 1:30 a.m.
Message ID <15d37065fe2f87cb6f7f.1408930215@localhost.localdomain>
Download mbox | patch
Permalink /patch/5591/
State Accepted
Headers show

Comments

Mads Kiilerich - Aug. 25, 2014, 1:30 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1408930071 -7200
#      Mon Aug 25 03:27:51 2014 +0200
# Node ID 15d37065fe2f87cb6f7f08ec502365b616d4c4f1
# Parent  9b413ee4351566d11951598d237fc90d0fa514a4
tests: fix p4 tests so they use separate ports and can be run in parallel

Patch

diff --git a/tests/test-convert-p4-filetypes.t b/tests/test-convert-p4-filetypes.t
--- a/tests/test-convert-p4-filetypes.t
+++ b/tests/test-convert-p4-filetypes.t
@@ -8,7 +8,7 @@  create p4 depot
   $ 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
 
diff --git a/tests/test-convert-p4.t b/tests/test-convert-p4.t
--- a/tests/test-convert-p4.t
+++ b/tests/test-convert-p4.t
@@ -8,7 +8,7 @@  create p4 depot
   $ 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