10 files changed, 44 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index b3c41a6..0a26988 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ utils/.DS_Store
 perf.data
 perf.data.old
 run
+shell/lasttest.out
+shell/lasttest.err
 tables/*
 test/*/runtest
 test/.DS_Store
diff --git a/Makefile b/Makefile
index fbf43b1..8e7948e 100644
--- a/Makefile
+++ b/Makefile
@@ -30,10 +30,13 @@ debugtool: debugnissy.o
 
 shell: nissy.o
         mkdir -p tables
-        ${CC} ${MACROS} ${CFLAGS} -o run nissy.o shell.c
+        ${CC} ${MACROS} ${CFLAGS} -o run nissy.o shell/shell.c
 
 debugshell: debugnissy.o
         mkdir -p tables
-        ${CC} ${MACROS} ${DBGFLAGS} -o run debugnissy.o shell.c
+        ${CC} ${MACROS} ${DBGFLAGS} -o run debugnissy.o shell/shell.c
 
-.PHONY: all clean test tool debugtool shell debugshell
+shelltest: debugshell
+        ./shell/test.sh
+
+.PHONY: all clean test tool debugtool shell debugshell shelltest
diff --git a/README.md b/README.md
index 6ae0f05..554599d 100644
--- a/README.md
+++ b/README.md
@@ -108,8 +108,14 @@ commands manually. To build the shell use:
 $ make shell
 ```
 
-This will create an executable called `run`.  Then you can for example
-get a cube from a sequence of moves:
+This will create an executable called `run`.
+Optionally, you can run some tests:
+
+```
+$ make shelltest
+```
+
+Then you can for example get a cube from a sequence of moves:
 
 ```
 $ ./run frommoves -moves "R' U' F"
diff --git a/shell.c b/shell/shell.c
index 306ad78..de03656 100644
--- a/shell.c
+++ b/shell/shell.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "src/nissy.h"
+#include "../src/nissy.h"
 
 #define PRINTCUBE_BUFFER_SIZE UINT64_C(1024)
 #define SOLUTIONS_BUFFER_SIZE UINT64_C(500000)
diff --git a/shell/test.sh b/shell/test.sh
new file mode 100755
index 0000000..de888ef
--- /dev/null
+++ b/shell/test.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+SHELLBIN="./run"
+TESTDIR="./shell/testcases"
+TESTOUT="shell/lasttest.out"
+TESTERR="shell/lasttest.err"
+
+for cin in "$TESTDIR"/*.in; do
+        c=$(echo "$cin" | sed 's/\.in//')
+        cout="$c.out"
+        printf "%s: " "$c"
+        (cat "$cin" | xargs "$SHELLBIN") > $TESTOUT 2> $TESTERR
+        if diff "$cout" "$TESTOUT"; then
+                printf "OK\n"
+        else
+                printf "Test failed! stderr:\n"
+                cat $TESTERR
+                exit 1
+        fi
+done
+
+echo "All tests passed!"
diff --git a/shell/testcases/000_frommoves.in b/shell/testcases/000_frommoves.in
new file mode 100644
index 0000000..2b3c6d1
--- /dev/null
+++ b/shell/testcases/000_frommoves.in
@@ -0,0 +1 @@
+frommoves -moves "UFRR"
diff --git a/shell/testcases/000_frommoves.out b/shell/testcases/000_frommoves.out
new file mode 100644
index 0000000..dfefe81
--- /dev/null
+++ b/shell/testcases/000_frommoves.out
@@ -0,0 +1 @@
+DEOISVBH=ZFCYHAGBLTKU
diff --git a/shell/testcases/001_compose.in b/shell/testcases/001_compose.in
new file mode 100644
index 0000000..fa09a0b
--- /dev/null
+++ b/shell/testcases/001_compose.in
@@ -0,0 +1 @@
+compose -cube NEORSQLH=ZFCYUAGLHTKB -perm NEORSQLH=ZFCYUAGLHTKB
diff --git a/shell/testcases/001_compose.out b/shell/testcases/001_compose.out
new file mode 100644
index 0000000..d36a93c
--- /dev/null
+++ b/shell/testcases/001_compose.out
@@ -0,0 +1 @@
+ASTUGFBH=DACXEZGBLIKF
diff --git a/test/test.sh b/test/test.sh
index a675286..8b5db35 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -10,7 +10,7 @@ for t in test/*; do
         if [ -n "$re" ] && !(echo "$t" | grep -q "$re"); then
                 continue
         fi
-        
+
         # Verify if $t is a directory and if its name starts with three digits
         if [ -d "$t" ] && basename "$t" | grep -Eq '^[0-9]{3}'; then
                 $CC -o $TESTBIN "$t"/*.c $OBJ || exit 1