More explicit test arguments

Author: Arxcis

Makefile

@@ -9,6 +9,8 @@ test.example:
 
 test.01:
 	make test DAY=day-01
+test.02:
+	make test DAY=day-02
 
 #
 # make docker.test DAY=<day>
@@ -21,14 +23,15 @@ test.01:
 # Benefit 2: Reproduceability - Makes sure tests run with the same versions on any machine, regardless of what is installed on the host machine.
 #
 docker.test:
-	docker pull jonasjso/adventofcode2020:latest;
 	docker run -ti --env DAY=$(DAY) -v $(PWD):/test jonasjso/adventofcode2020:latest /bin/bash -c "cd /test && make test && exit"
 
 docker.example:
 	make docker.test DAY=day-00-example
 
 docker.01:
 	make docker.test DAY=day-01
+docker.02:
+	make docker.test DAY=day-02
 
 docker.all:
 	docker run -ti -v $(PWD):/test jonasjso/adventofcode2020:latest /bin/bash -c "cd /test && make && exit"

README.md

@@ -33,7 +33,13 @@ Here you can see the status of automatic tests run by Github CI:
 ![days/day-25](https://github.com/Arxcis/adventofcode2020/workflows/days/day-25/badge.svg)
 ![days/day-00-example](https://github.com/Arxcis/adventofcode2020/workflows/days/day-00-example/badge.svg)
 
-## Getting started if you are running Docker
+## Example: Testing a single solution
+
+```
+./scripts/test-rust.sh days/day-01 solutions/main.rs
+```
+
+## Testing if you are running Docker
 
 If you are running docker, you can run tests inside a docker-container by doing:
 ```
@@ -42,8 +48,8 @@ make docker.01              // Expect to fail because we don't have any day-01 s
 make docker.all             // Expect some tests to succeed, some fail
 ```
 
-## Getting started if you are not running Docker
-If you are not running docker, you have to install languages we support on your host system. See the [Dockerfile](./Dockerfile) for how you can do this on debian-based systems. 
+## Testing if you are not running Docker
+If you are not running docker, you have to install languages we support on your host system. See the [Dockerfile](./Dockerfile) for how you can do this on debian-based systems.
 
 You can run the tests directly on your host system by doing:
 ```

days/day-00-example/test.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
-DIR=$(dirname $(realpath $0))
+D=$(dirname $(realpath $0))
 
 # Run tests
-$DIR/../../scripts/test-bash.sh $DIR "solutions/example.bash"
-$DIR/../../scripts/test-c.sh    $DIR "solutions/example.c"
-$DIR/../../scripts/test-cpp.sh  $DIR "solutions/example.cpp"
-$DIR/../../scripts/test-go.sh   $DIR "solutions/example.go"
-$DIR/../../scripts/test-java.sh $DIR solutions Example
-$DIR/../../scripts/test-node.sh $DIR "solutions/example.node.mjs"
-$DIR/../../scripts/test-php.sh  $DIR "solutions/example.php"
-$DIR/../../scripts/test-py.sh   $DIR "solutions/example.py"
-$DIR/../../scripts/test-rust.sh $DIR "solutions/example.rs"
+$D/../../scripts/test-bash.sh $D/input.txt $D/output.txt $D/solutions/example.bash
+$D/../../scripts/test-c.sh    $D/input.txt $D/output.txt $D/solutions/example.c
+$D/../../scripts/test-cpp.sh  $D/input.txt $D/output.txt $D/solutions/example.cpp
+$D/../../scripts/test-go.sh   $D/input.txt $D/output.txt $D/solutions/example.go
+$D/../../scripts/test-java.sh $D/input.txt $D/output.txt $D/solutions Example
+$D/../../scripts/test-node.sh $D/input.txt $D/output.txt $D/solutions/example.node.mjs
+$D/../../scripts/test-php.sh  $D/input.txt $D/output.txt $D/solutions/example.php
+$D/../../scripts/test-py.sh   $D/input.txt $D/output.txt $D/solutions/example.py
+$D/../../scripts/test-rust.sh $D/input.txt $D/output.txt $D/solutions/example.rs

days/day-01/solutions/main.rs

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-# Usage:   ./test-bash.sh DIR     SOLUTION
-# Example: ./test-bash.sh /day-03 solutions/main.bash
+# Usage:   ./test-bash.sh INPUT              OUTPUT             SOLUTION
+# Example: ./test-bash.sh /day-03/input.txt  /day-03/input.txt  /day-03/solutions/main.bash
 
-DIR="$1"
-SOLUTION="$2"
+INPUT="$1"
+OUTPUT="$2"
+SOLUTION="$3"
 
-cat "$DIR/input.txt" | bash "$DIR/$SOLUTION" | diff - "$DIR/output.txt"
-echo "$DIR / bash $SOLUTION ✅"
+cat "$INPUT" | bash "$SOLUTION" | diff - "$OUTPUT"
+echo "cat INPUT | bash $SOLUTION ✅"

scripts/test-bash.sh

@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
-# Usage:   ../test-c.sh DIR     SOLUTION
-# Example: ../test-c.sh /day-03 solutions/main.c
+# Usage:   ./test-c.sh INPUT              OUTPUT             SOLUTION
+# Example: ./test-c.sh /day-03/input.txt  /day-03/input.txt  /day-03/solutions/main.c
 
-DIR="$1"
-SOLUTION="$2"
-OUT="gcc.out"
+INPUT="$1"
+OUTPUT="$2"
+SOLUTION="$3"
+OUT="/tmp/aoc2020.gcc.out"
 
-gcc "$DIR/$SOLUTION" -o "$DIR/$OUT";
-cat "$DIR/input.txt" | "$DIR/$OUT" | diff - "$DIR/output.txt"
-rm "$DIR/$OUT";
-echo "$DIR / gcc $SOLUTION -o $OUT && ./$OUT ✅"
+gcc $SOLUTION -o $OUT;
+cat $INPUT | $OUT | diff - $OUTPUT
+rm $OUT;
+echo "cat INPUT | gcc $SOLUTION ✅"

scripts/test-c.sh

@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
-# Usage:   ../test-cpp.sh DIR     SOLUTION
-# Example: ../test-cpp.sh /day-03 solutions/main.cpp
+# Usage:   ./test-cpp.sh INPUT              OUTPUT             SOLUTION
+# Example: ./test-cpp.sh /day-03/input.txt  /day-03/input.txt  /day-03/solutions/main.cpp
 
-DIR="$1"
-SOLUTION="$2"
-OUT="g++.out"
+INPUT="$1"
+OUTPUT="$2"
+SOLUTION="$3"
+OUT="/tmp/aoc2020.g++.out"
 
-g++ "$DIR/$SOLUTION" -o "$DIR/$OUT";
-cat "$DIR/input.txt" | "$DIR/$OUT" | diff - "$DIR/output.txt"
-rm "$DIR/$OUT";
-echo "$DIR / g++ $SOLUTION -o $OUT && ./$OUT ✅"
+g++ $SOLUTION -o $OUT;
+cat $INPUT | $OUT | diff - $OUTPUT
+rm $OUT;
+echo "cat INPUT | g++ $SOLUTION ✅"

scripts/test-cpp.sh

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-# Usage:   ../test-go.sh DIR                      SOLUTION
-# Example: ../test-go.sh /adventofcode2020/day-03 solutions/main.go
+# Usage:   ./test-go.sh INPUT              OUTPUT             SOLUTION
+# Example: ./test-go.sh /day-03/input.txt  /day-03/input.txt  /day-03/solutions/main.go
 
-DIR="$1"
-SOLUTION="$2"
+INPUT="$1"
+OUTPUT="$2"
+SOLUTION="$3"
 
-cat "$DIR/input.txt" | go run "$DIR/$SOLUTION" | diff - "$DIR/output.txt"
-echo "$DIR / go run $SOLUTION ✅"
+cat $INPUT | go run $SOLUTION | diff - $OUTPUT
+echo "cat INPUT | go run $SOLUTION ✅"

scripts/test-go.sh

@@ -1,16 +1,18 @@
 #!/usr/bin/env bash
 set -e
 
-# Usage:   ../test-c.sh DIR     SOLUTION_DIR JAVA_CLASSNAME
-# Example: ../test-c.sh /day-03 solutions    Main
+# Usage:   ./test-java.sh INPUT              OUTPUT             SOLUTION_DIR      JAVA_CLASSNAME
+# Example: ./test-java.sh /day-03/input.txt  /day-03/input.txt  /day-03/solutions Example
+
+INPUT="$1"
+OUTPUT="$2"
+SOLUTION_DIR="$3"
+JAVA_CLASSNAME="$4"
 
-DIR="$1"
-SOLUTION_DIR="$2"
-JAVA_CLASSNAME="$3"
 JAVA_CLASSFILE="$JAVA_CLASSNAME.class"
 
-cd "$DIR/$SOLUTION_DIR"
+cd $SOLUTION_DIR
 javac "$JAVA_CLASSNAME.java"
-cat "$DIR/input.txt" | java "$JAVA_CLASSNAME" | diff - "$DIR/output.txt"
+cat $INPUT | java $JAVA_CLASSNAME | diff - $OUTPUT
 rm "$DIR/$SOLUTION_DIR/$JAVA_CLASSFILE";
-echo "$DIR / javac $JAVA_CLASSNAME.java && java $JAVA_CLASSNAME ✅"
+echo "cat INPUT | javac $SOLUTION_DIR/$JAVA_CLASSNAME.java ✅"

scripts/test-java.sh

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-# Usage:   ../test-node.sh DIR                      SOLUTION
-# Example: ../test-node.sh /adventofcode2020/day-03 solutions/main.node.mjs
+# Usage:   ./test-node.sh INPUT              OUTPUT             SOLUTION
+# Example: ./test-node.sh /day-03/input.txt  /day-03/input.txt  /day-03/solutions/main.node.mjs
 
-DIR="$1"
-SOLUTION="$2"
+INPUT="$1"
+OUTPUT="$2"
+SOLUTION="$3"
 
-cat "$DIR/input.txt" | node "$DIR/$SOLUTION" | diff - "$DIR/output.txt"
-echo "$DIR / node $SOLUTION ✅"
+cat $INPUT | node $SOLUTION | diff - $OUTPUT
+echo "cat INPUT | node $SOLUTION ✅"