From d4272db067162da7cae65977ae1cdc2e283f113c Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Sat, 18 Mar 2017 04:14:50 -0700 Subject: [PATCH] travis: only run 4 jobs at once (#593) We can only run 4 at a time; 5 causes the test time to double. In the past we had a 50minute build deadline, but that's fixed. --- .travis.yml | 3 +-- regression/Makefile | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 171d91bd..37a4eb52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,7 @@ env: - SUITE=RocketSuiteA - SUITE=RocketSuiteB - SUITE=RocketSuiteC - - SUITE=GroundtestSuiteA - - SUITE=GroundtestSuiteB + - SUITE=GroundtestSuite - SUITE=UnittestSuite # blacklist private branches diff --git a/regression/Makefile b/regression/Makefile index f9a59e7a..c5393dc1 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -56,16 +56,12 @@ PROJECT=rocketchip CONFIGS=DefaultL2Config TinyConfig endif -ifeq ($(SUITE),GroundtestSuiteA) +ifeq ($(SUITE),GroundtestSuite) PROJECT=groundtest -CONFIGS=MemtestConfig MemtestBufferlessConfig MemtestStatelessConfig -# FancyMemtestConfig takes too long to compile -endif - -ifeq ($(SUITE),GroundtestSuiteB) -PROJECT=groundtest -CONFIGS=BroadcastRegressionTestConfig BufferlessRegressionTestConfig CacheRegressionTestConfig \ +CONFIGS=MemtestConfig MemtestBufferlessConfig MemtestStatelessConfig \ + BroadcastRegressionTestConfig BufferlessRegressionTestConfig CacheRegressionTestConfig \ ComparatorConfig ComparatorBufferlessConfig ComparatorStatelessConfig +# FancyMemtestConfig takes too long to compile endif ifeq ($(SUITE),UnittestSuite)