Committer: Tamio Vesa Nakajima <[email protected]>

Fixed a fatal undetected error Added -o flag to buildtest (for only rebuilding the outputs). Changes to be committed: modified: examples/aplusb/buildtests modified: examples/aplusb/incf/fixed deleted: examples/aplusb/incf/makefile modified: examples/aplusb/ingen/ingen.bin modified: examples/aplusb/ingen/ingen.cpp new file: examples/aplusb/oldtests/.zip new file: examples/aplusb/oldtests/asdfjkl;.zip modified: examples/aplusb/oldtests/first.zip new file: examples/aplusb/oldtests/frths.zip new file: examples/aplusb/oldtests/lll.zip new file: examples/aplusb/oldtests/snd.zip new file: examples/aplusb/oldtests/thrd.zip modified: examples/aplusb/src/wa.cpp modified: examples/aplusb/tests/aplusb-0.in modified: examples/aplusb/tests/aplusb-0.ok modified: examples/aplusb/tests/aplusb-1.in modified: examples/aplusb/tests/aplusb-1.ok modified: examples/aplusb/tests/aplusb-10.in modified: examples/aplusb/tests/aplusb-10.ok modified: examples/aplusb/tests/aplusb-11.in modified: examples/aplusb/tests/aplusb-11.ok modified: examples/aplusb/tests/aplusb-12.in modified: examples/aplusb/tests/aplusb-12.ok modified: examples/aplusb/tests/aplusb-13.in modified: examples/aplusb/tests/aplusb-13.ok modified: examples/aplusb/tests/aplusb-14.in modified: examples/aplusb/tests/aplusb-14.ok modified: examples/aplusb/tests/aplusb-15.in modified: examples/aplusb/tests/aplusb-15.ok modified: examples/aplusb/tests/aplusb-16.in modified: examples/aplusb/tests/aplusb-16.ok modified: examples/aplusb/tests/aplusb-17.in modified: examples/aplusb/tests/aplusb-17.ok modified: examples/aplusb/tests/aplusb-18.in modified: examples/aplusb/tests/aplusb-18.ok modified: examples/aplusb/tests/aplusb-2.in modified: examples/aplusb/tests/aplusb-2.ok modified: examples/aplusb/tests/aplusb-3.in modified: examples/aplusb/tests/aplusb-3.ok modified: examples/aplusb/tests/aplusb-4.in modified: examples/aplusb/tests/aplusb-4.ok modified: examples/aplusb/tests/aplusb-5.in modified: examples/aplusb/tests/aplusb-5.ok modified: examples/aplusb/tests/aplusb-6.in modified: examples/aplusb/tests/aplusb-6.ok modified: examples/aplusb/tests/aplusb-7.in modified: examples/aplusb/tests/aplusb-7.ok modified: examples/aplusb/tests/aplusb-8.in modified: examples/aplusb/tests/aplusb-8.ok modified: examples/aplusb/tests/aplusb-9.in modified: examples/aplusb/tests/aplusb-9.ok deleted: examples/aplusb/tests/tests/aplusb-0.in deleted: examples/aplusb/tests/tests/aplusb-0.ok deleted: examples/aplusb/tests/tests/aplusb-1.in deleted: examples/aplusb/tests/tests/aplusb-1.ok deleted: examples/aplusb/tests/tests/aplusb-2.in deleted: examples/aplusb/tests/tests/aplusb-2.ok deleted: examples/aplusb/tests/tests/aplusb-3.in deleted: examples/aplusb/tests/tests/aplusb-3.ok modified: src/buildtests
tamionv · May 20, 2018 · 021ac93 · 021ac93
1 parent 4f115c5
commit 021ac93
Show file tree

Hide file tree

Showing 60 changed files with 93 additions and 56 deletions.
diff --git a/examples/aplusb/buildtests b/examples/aplusb/buildtests
@@ -13,8 +13,9 @@ source problemconfig
 # ARGUMENT PARSING
 #############################
 
+rebuild_inputs=true
 
-while getopts "r:h" opt; do
+while getopts "r:ho" opt; do
     case $opt in
         h)
             echo "Usage: ./run -r(estore) [revision to restore]"
@@ -25,6 +26,9 @@ while getopts "r:h" opt; do
             unzip oldtests/$OPTARG.zip
             exit 0
             ;;
+        o)
+            rebuild_inputs=false
+            ;;
     esac
 done
 
@@ -48,25 +52,27 @@ cat testmanifest | while read instr; do
         # Build input:
         #################
 
-        # Build input generator
-        try "cd ingen && make -s && cd .." "input generator build fail"
+        if [ $rebuild_inputs = true ] ; then
+            # Build input generator
+            cd ingen && make -s && cd ..
 
-        # Copy ingen/ingen.bin and incf/$1 into stage
-        cp ingen/ingen.bin stage/$problemname.bin
-        try "cp incf/$incf stage/$problemname.cf" "incf/$incf doesn't exist"
+            # Copy ingen/ingen.bin and incf/$1 into stage
+            cp ingen/ingen.bin stage/$problemname.bin
+            cp incf/$incf stage/$problemname.cf
 
-        # Build input
-        try "cd stage && ./$problemname.bin > ../tests/$problemname-$nr.in && cd .." "input generation fail"
+            # Build input
+            cd stage && ./$problemname.bin && cp $problemname.in ../tests/$problemname-$nr.in && cd ..
 
-        # Clean stage
-        rm stage/*
+            # Clean stage
+            rm stage/*
+        fi
 
         ###################
         # Build ok
         ###################
 
         # Build ok generator
-        try "cd okgen && make -s && cd .." "ok generator build fil"
+        cd okgen && make -s && cd ..
 
         # Copy ok generator and input into stage
         cp okgen/okgen.bin stage/$problemname.bin
@@ -76,7 +82,7 @@ cat testmanifest | while read instr; do
         echo $points > stage/$problemname.points
 
         # Build ok
-        try "cd stage && ./$problemname.bin && cd .." "ok generation fail"
+        cd stage && ./$problemname.bin && cd ..
 
         # Copy ok from stage into tests
         cp stage/$problemname.ok tests/$problemname-$nr.ok
@@ -89,4 +95,8 @@ cat testmanifest | while read instr; do
     currtest=$(($currtest + $numberoftests))
 done
 
-zip -r oldtests/$testrevision.zip tests/*
+if [[ $testrevision = "" ]] ; then
+    :
+else
+    zip -r oldtests/$testrevision.zip tests/*
+fi
diff --git a/examples/aplusb/incf/fixed b/examples/aplusb/incf/fixed
@@ -1 +1 @@
-1 0 1
+1 0 2
diff --git a/examples/aplusb/incf/makefile b/examples/aplusb/incf/makefile
diff --git a/examples/aplusb/ingen/ingen.bin b/examples/aplusb/ingen/ingen.bin
diff --git a/examples/aplusb/ingen/ingen.cpp b/examples/aplusb/ingen/ingen.cpp
@@ -8,8 +8,11 @@ int main(){
     bool fixed;
     int x, y;
     f >> fixed >> x >> y;
+    cout << fixed << ' ' << x << ' ' << y << endl;
 
-    if(fixed) g << x << ' ' << y << endl;
+    if(fixed){
+        g << x << ' ' << y << endl;
+    }
     else{
         srand(time(nullptr));
         g << rand() << ' ' << rand() << endl; }

diff --git a/examples/aplusb/oldtests/.zip b/examples/aplusb/oldtests/.zip
diff --git a/examples/aplusb/oldtests/asdfjkl;.zip b/examples/aplusb/oldtests/asdfjkl;.zip
diff --git a/examples/aplusb/oldtests/first.zip b/examples/aplusb/oldtests/first.zip
diff --git a/examples/aplusb/oldtests/frths.zip b/examples/aplusb/oldtests/frths.zip
diff --git a/examples/aplusb/oldtests/lll.zip b/examples/aplusb/oldtests/lll.zip
diff --git a/examples/aplusb/oldtests/snd.zip b/examples/aplusb/oldtests/snd.zip
diff --git a/examples/aplusb/oldtests/thrd.zip b/examples/aplusb/oldtests/thrd.zip
diff --git a/examples/aplusb/src/wa.cpp b/examples/aplusb/src/wa.cpp
@@ -1,4 +1,7 @@
 #include <iostream>
+#include <fstream>
 using namespace std;
 
-int main(){}
+int main(){
+    ofstream g("aplusb.out");
+    g << -1 << endl; }
diff --git a/examples/aplusb/tests/aplusb-0.in b/examples/aplusb/tests/aplusb-0.in
@@ -0,0 +1 @@
+0 2
diff --git a/examples/aplusb/tests/aplusb-0.ok b/examples/aplusb/tests/aplusb-0.ok
@@ -1,2 +1,2 @@
 10
-0
+2
diff --git a/examples/aplusb/tests/aplusb-1.in b/examples/aplusb/tests/aplusb-1.in
@@ -0,0 +1 @@
+1394068970 1070590020
diff --git a/examples/aplusb/tests/aplusb-1.ok b/examples/aplusb/tests/aplusb-1.ok
@@ -1,2 +1,2 @@
 5
-0
+2464658990
diff --git a/examples/aplusb/tests/aplusb-10.in b/examples/aplusb/tests/aplusb-10.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-10.ok b/examples/aplusb/tests/aplusb-10.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-11.in b/examples/aplusb/tests/aplusb-11.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-11.ok b/examples/aplusb/tests/aplusb-11.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-12.in b/examples/aplusb/tests/aplusb-12.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-12.ok b/examples/aplusb/tests/aplusb-12.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-13.in b/examples/aplusb/tests/aplusb-13.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-13.ok b/examples/aplusb/tests/aplusb-13.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-14.in b/examples/aplusb/tests/aplusb-14.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-14.ok b/examples/aplusb/tests/aplusb-14.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-15.in b/examples/aplusb/tests/aplusb-15.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-15.ok b/examples/aplusb/tests/aplusb-15.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-16.in b/examples/aplusb/tests/aplusb-16.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-16.ok b/examples/aplusb/tests/aplusb-16.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-17.in b/examples/aplusb/tests/aplusb-17.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-17.ok b/examples/aplusb/tests/aplusb-17.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-18.in b/examples/aplusb/tests/aplusb-18.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-18.ok b/examples/aplusb/tests/aplusb-18.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/aplusb-2.in b/examples/aplusb/tests/aplusb-2.in
@@ -0,0 +1 @@
+1394068970 1070590020
diff --git a/examples/aplusb/tests/aplusb-2.ok b/examples/aplusb/tests/aplusb-2.ok
@@ -1,2 +1,2 @@
 5
-0
+2464658990
diff --git a/examples/aplusb/tests/aplusb-3.in b/examples/aplusb/tests/aplusb-3.in
@@ -0,0 +1 @@
+1394068970 1070590020
diff --git a/examples/aplusb/tests/aplusb-3.ok b/examples/aplusb/tests/aplusb-3.ok
@@ -1,2 +1,2 @@
 5
-0
+2464658990
diff --git a/examples/aplusb/tests/aplusb-4.in b/examples/aplusb/tests/aplusb-4.in
@@ -0,0 +1 @@
+1394068970 1070590020
diff --git a/examples/aplusb/tests/aplusb-4.ok b/examples/aplusb/tests/aplusb-4.ok
@@ -1,2 +1,2 @@
 5
-0
+2464658990
diff --git a/examples/aplusb/tests/aplusb-5.in b/examples/aplusb/tests/aplusb-5.in
@@ -0,0 +1 @@
+1394068970 1070590020
diff --git a/examples/aplusb/tests/aplusb-5.ok b/examples/aplusb/tests/aplusb-5.ok
@@ -1,2 +1,2 @@
 5
-0
+2464658990
diff --git a/examples/aplusb/tests/aplusb-6.in b/examples/aplusb/tests/aplusb-6.in
@@ -0,0 +1 @@
+1394068970 1070590020
diff --git a/examples/aplusb/tests/aplusb-6.ok b/examples/aplusb/tests/aplusb-6.ok
@@ -1,2 +1,2 @@
 5
-0
+2464658990
diff --git a/examples/aplusb/tests/aplusb-7.in b/examples/aplusb/tests/aplusb-7.in
@@ -0,0 +1 @@
+1394068970 1070590020
diff --git a/examples/aplusb/tests/aplusb-7.ok b/examples/aplusb/tests/aplusb-7.ok
@@ -1,2 +1,2 @@
 5
-0
+2464658990
diff --git a/examples/aplusb/tests/aplusb-8.in b/examples/aplusb/tests/aplusb-8.in
@@ -0,0 +1 @@
+1394068970 1070590020
diff --git a/examples/aplusb/tests/aplusb-8.ok b/examples/aplusb/tests/aplusb-8.ok
@@ -1,2 +1,2 @@
 5
-0
+2464658990
diff --git a/examples/aplusb/tests/aplusb-9.in b/examples/aplusb/tests/aplusb-9.in
@@ -0,0 +1 @@
+1394085777 1353065269
diff --git a/examples/aplusb/tests/aplusb-9.ok b/examples/aplusb/tests/aplusb-9.ok
@@ -1,2 +1,2 @@
 5
-0
+2747151046
diff --git a/examples/aplusb/tests/tests/aplusb-0.in b/examples/aplusb/tests/tests/aplusb-0.in
diff --git a/examples/aplusb/tests/tests/aplusb-0.ok b/examples/aplusb/tests/tests/aplusb-0.ok
diff --git a/examples/aplusb/tests/tests/aplusb-1.in b/examples/aplusb/tests/tests/aplusb-1.in
diff --git a/examples/aplusb/tests/tests/aplusb-1.ok b/examples/aplusb/tests/tests/aplusb-1.ok
diff --git a/examples/aplusb/tests/tests/aplusb-2.in b/examples/aplusb/tests/tests/aplusb-2.in
diff --git a/examples/aplusb/tests/tests/aplusb-2.ok b/examples/aplusb/tests/tests/aplusb-2.ok
diff --git a/examples/aplusb/tests/tests/aplusb-3.in b/examples/aplusb/tests/tests/aplusb-3.in
diff --git a/examples/aplusb/tests/tests/aplusb-3.ok b/examples/aplusb/tests/tests/aplusb-3.ok
diff --git a/src/buildtests b/src/buildtests
@@ -13,8 +13,9 @@ source problemconfig
 # ARGUMENT PARSING
 #############################
 
+rebuild_inputs=true
 
-while getopts "r:h" opt; do
+while getopts "r:ho" opt; do
     case $opt in
         h)
             echo "Usage: ./run -r(estore) [revision to restore]"
@@ -25,6 +26,9 @@ while getopts "r:h" opt; do
             unzip oldtests/$OPTARG.zip
             exit 0
             ;;
+        o)
+            rebuild_inputs=false
+            ;;
     esac
 done
 
@@ -48,25 +52,27 @@ cat testmanifest | while read instr; do
         # Build input:
         #################
 
-        # Build input generator
-        try "cd ingen && make -s && cd .." "input generator build fail"
+        if [ $rebuild_inputs = true ] ; then
+            # Build input generator
+            cd ingen && make -s && cd ..
 
-        # Copy ingen/ingen.bin and incf/$1 into stage
-        cp ingen/ingen.bin stage/$problemname.bin
-        try "cp incf/$incf stage/$problemname.cf" "incf/$incf doesn't exist"
+            # Copy ingen/ingen.bin and incf/$1 into stage
+            cp ingen/ingen.bin stage/$problemname.bin
+            cp incf/$incf stage/$problemname.cf
 
-        # Build input
-        try "cd stage && ./$problemname.bin > ../tests/$problemname-$nr.in && cd .." "input generation fail"
+            # Build input
+            cd stage && ./$problemname.bin && cp $problemname.in ../tests/$problemname-$nr.in && cd ..
 
-        # Clean stage
-        rm stage/*
+            # Clean stage
+            rm stage/*
+        fi
 
         ###################
         # Build ok
         ###################
 
         # Build ok generator
-        try "cd okgen && make -s && cd .." "ok generator build fil"
+        cd okgen && make -s && cd ..
 
         # Copy ok generator and input into stage
         cp okgen/okgen.bin stage/$problemname.bin
@@ -76,7 +82,7 @@ cat testmanifest | while read instr; do
         echo $points > stage/$problemname.points
 
         # Build ok
-        try "cd stage && ./$problemname.bin && cd .." "ok generation fail"
+        cd stage && ./$problemname.bin && cd ..
 
         # Copy ok from stage into tests
         cp stage/$problemname.ok tests/$problemname-$nr.ok
@@ -89,4 +95,8 @@ cat testmanifest | while read instr; do
     currtest=$(($currtest + $numberoftests))
 done
 
-zip -r oldtests/$testrevision.zip tests/*
+if [[ $testrevision = "" ]] ; then
+    :
+else
+    zip -r oldtests/$testrevision.zip tests/*
+fi