From d9a52384338d239a06b3e72af39bebbf4a40f4e9 Mon Sep 17 00:00:00 2001 From: Peter Aaser Date: Thu, 12 Sep 2019 11:31:25 +0200 Subject: [PATCH 1/4] Update deliver.sh --- deliver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deliver.sh b/deliver.sh index 180e209..83fd85a 100755 --- a/deliver.sh +++ b/deliver.sh @@ -13,14 +13,14 @@ cp build.sbt ./wrap cp project/Dependencies.scala ./wrap/project/Dependencies.scala cp project/build.properties ./wrap/project/build.properties cp sbt.sh ./wrap -(cd ./wrap/; tar czfv $username.gz .) +(cd ./wrap/; tar czfv $username.tar.gz .) mv ./wrap/$username.gz . rm -rf ./wrap echo "Unwrapping and testing your wrapped package" mkdir wrapTest -tar -C ./wrapTest -xvf $username.gz +tar -C ./wrapTest -xvf $username.tar.gz ./wrapTest/sbt.sh test rm -rf ./wrapTest From 3c668fa963eceebb1d74ae239874aebcc1e04163 Mon Sep 17 00:00:00 2001 From: Peter Aaser Date: Tue, 1 Oct 2019 15:06:45 +0200 Subject: [PATCH 2/4] Update testRunner.scala Add enough steps --- src/test/scala/RISCV/testRunner.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/scala/RISCV/testRunner.scala b/src/test/scala/RISCV/testRunner.scala index 0e25da6..8ef1f1f 100644 --- a/src/test/scala/RISCV/testRunner.scala +++ b/src/test/scala/RISCV/testRunner.scala @@ -49,7 +49,7 @@ object TestRunner { binary.toList.sortBy(_._1.value).map(_._2), program.settings, finalVM.pc, - 1500) + 15000) } yield { val traces = mergeTraces(trace, chiselTrace).map(x => printMergedTraces((x), program)) From 626868db89d9959451cb4e1ceab9de46767f75c9 Mon Sep 17 00:00:00 2001 From: Peter Aaser Date: Thu, 3 Oct 2019 11:02:28 +0200 Subject: [PATCH 3/4] Delete arithmetic.s --- src/test/resources/tests/basic/immediate/arithmetic.s | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/test/resources/tests/basic/immediate/arithmetic.s diff --git a/src/test/resources/tests/basic/immediate/arithmetic.s b/src/test/resources/tests/basic/immediate/arithmetic.s deleted file mode 100644 index e69de29..0000000 From da05c8924c484dcaed62b434e25b987a7dadd638 Mon Sep 17 00:00:00 2001 From: Peter Aaser Date: Mon, 7 Oct 2019 17:44:16 +0200 Subject: [PATCH 4/4] Update deliver.sh Fixed oopsie --- deliver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deliver.sh b/deliver.sh index 83fd85a..5d6deae 100755 --- a/deliver.sh +++ b/deliver.sh @@ -14,7 +14,7 @@ cp project/Dependencies.scala ./wrap/project/Dependencies.scala cp project/build.properties ./wrap/project/build.properties cp sbt.sh ./wrap (cd ./wrap/; tar czfv $username.tar.gz .) -mv ./wrap/$username.gz . +mv ./wrap/$username.tar.gz . rm -rf ./wrap