From 09833fdfb189ca1bde65c2ff33d01792881f0784 Mon Sep 17 00:00:00 2001
From: Santosh Srivatsan <santosh.srivatsan@gmail.com>
Date: Sat, 5 Feb 2022 14:34:36 -0500
Subject: [PATCH 1/3] Fixed merge conflict

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c081c8ce..89e77d86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,9 +30,6 @@ jobs:
   include:
     - stage: test
       name: coverage
-<<<<<<< HEAD
-      script: cp -r $PWD ../build_coverage && cd ../build_coverage && ./ci/travis_run.py ./ci/regression.sh -coverage    
-=======
       script: cp -r $PWD ../build_coverage && cd ../build_coverage && ./ci/travis_run.py ./ci/regression.sh -coverage
     - stage: test
       name: coverage64
@@ -40,7 +37,6 @@ jobs:
     - stage: test
       name: tex
       script: cp -r $PWD ../build_tex && cd ../build_tex && ./ci/travis_run.py ./ci/regression.sh -tex
->>>>>>> xlen-parameterization
     - stage: test
       name: cluster
       script: cp -r $PWD ../build_cluster && cd ../build_cluster && ./ci/travis_run.py ./ci/regression.sh -cluster    

From 6dd6a88c12481a88a8a19a3cd69523a01319b92a Mon Sep 17 00:00:00 2001
From: Santosh Srivatsan <santosh.srivatsan@gmail.com>
Date: Sat, 5 Feb 2022 14:37:05 -0500
Subject: [PATCH 2/3] Modified regression64.sh

---
 ci/regression64.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/regression64.sh b/ci/regression64.sh
index 3d16fbd3..785c1c88 100755
--- a/ci/regression64.sh
+++ b/ci/regression64.sh
@@ -10,7 +10,7 @@ coverage()
 {
 echo "begin coverage tests..."
 
-make -C tests/riscv/isa run-simx-64imfd
+make -C tests/riscv/isa run-simx-64
 
 echo "coverage tests done!"
 }

From 1b5b7a3cba8121e0a690fb62a5291c720a98698d Mon Sep 17 00:00:00 2001
From: Santosh Srivatsan <santosh.srivatsan@gmail.com>
Date: Sat, 5 Feb 2022 14:45:21 -0500
Subject: [PATCH 3/3] Modified travis.yml

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 89e77d86..2c30c3a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,6 @@ install:
   - export PATH=$VERILATOR_ROOT/bin:$PATH
   # Install toolchain
   - ci/toolchain_install.sh -all
-  # build project
-  - make -s
 
 # stages ordering
 stages: