From dcf8cee71285b0abee3b6c37886d84a4f8394636 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 26 Feb 2015 15:53:23 -0800 Subject: [PATCH 1/4] Better parallelize test running on Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d102f3d8477..476da337cb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: cpp -script: ./tools/run_tests/run_tests.py -lc -t -j2 +script: ./tools/run_tests/run_tests.py -l c -t -j 8 -c dbg notifications: email: false From 904da8cab6c1cd4561dc2c4a4f132918c48c367c Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 26 Feb 2015 15:59:15 -0800 Subject: [PATCH 2/4] Fix sorting --- tools/run_tests/jobset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index 7e1faa7b949..e40235341c0 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -292,7 +292,7 @@ def run(cmdlines, if not travis: cmdlines = shuffle_iteratable(cmdlines) else: - cmdlines = sorted(cmdlines) + cmdlines = sorted(cmdlines, key=lambda x: x.shortname) for cmdline in cmdlines: if not js.start(cmdline): break From 26a3c0777b33723065b4391618454dd25a8a89ff Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 26 Feb 2015 15:59:26 -0800 Subject: [PATCH 3/4] Add opt build again --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 476da337cb2..8c1b1f763ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: cpp -script: ./tools/run_tests/run_tests.py -l c -t -j 8 -c dbg +script: + - ./tools/run_tests/run_tests.py -l c -t -j 8 -c dbg + - ./tools/run_tests/run_tests.py -l c -t -j 8 -c opt notifications: email: false From 6d4b5c23c60a9f60f0526e6f39572582fc9c3c6c Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 26 Feb 2015 16:19:12 -0800 Subject: [PATCH 4/4] Double -j --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c1b1f763ac..46e74eb6990 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: cpp script: - - ./tools/run_tests/run_tests.py -l c -t -j 8 -c dbg - - ./tools/run_tests/run_tests.py -l c -t -j 8 -c opt + - ./tools/run_tests/run_tests.py -l c -t -j 16 -c dbg + - ./tools/run_tests/run_tests.py -l c -t -j 16 -c opt notifications: email: false