# HG changeset patch # User Mads Kiilerich # Date 1408930071 -7200 # Node ID a970a5c15b439808ebab469dce9aa3a6706ebc80 # Parent 102f0e926668d42d29d2ffc9fa3ca0678abc7fee tests: fix p4 tests so they use separate ports and can be run in parallel diff -r 102f0e926668 -r a970a5c15b43 tests/test-convert-p4-filetypes.t --- 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 diff -r 102f0e926668 -r a970a5c15b43 tests/test-convert-p4.t --- 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