add tests (2)

diff --git a/constant.c b/constant.c
index d192a8ae51415f301e752dac6911659f3d2be54c..073e0b2119de2ebac1f7ce115bd58b71442e05d4 100644 (file)
--- a/constant.c
+++ b/constant.c
@@ -36,14 +36,16 @@ board_t *getboard (char *name)
     } else if (strcmp (name, "16x16") == 0) {
         board = initboard (16, 16);
     } else if (strcmp (name, "list") == 0) {
-        printf ("board: 6x6 8x8 10x10 12x12 14x14 16x16\n");
+        printf ("board: 4x4 6x6 8x8 10x10 12x12 14x14 16x16\n");
         board = (board_t *)(-1);
     }
 
-    *getcell (board, board->width / 2 - 1, board->height / 2 - 1) = '0';
-    *getcell (board, board->width / 2 - 0, board->height / 2 - 1) = '1';
-    *getcell (board, board->width / 2 - 1, board->height / 2 - 0) = '1';
-    *getcell (board, board->width / 2 - 0, board->height / 2 - 0) = '0';
+    if ((board) && (board != (board_t *)(-1))) {
+        *getcell (board, board->width / 2 - 1, board->height / 2 - 1) = '0';
+        *getcell (board, board->width / 2 - 0, board->height / 2 - 1) = '1';
+        *getcell (board, board->width / 2 - 1, board->height / 2 - 0) = '1';
+        *getcell (board, board->width / 2 - 0, board->height / 2 - 0) = '0';
+    }
 
     return board;
 }

diff --git a/reversi.c b/reversi.c
index cc4cd0a115929abb80fbd0ad7ffa8b56edd108fa..3bd6a6a31ecd081b5e27204c0de911b13c8a723d 100644 (file)
--- a/reversi.c
+++ b/reversi.c
@@ -335,21 +335,21 @@ int main (int argc, char *argv[])
 /* test: reversi.exe -b unknown 2>&1 | grep 'unknown board' */
 /* test: reversi.exe -b list | grep '^board:' */
 /* test: reversi.exe -f 2>&1 | grep 'no file' */
-/* test: reversi.exe -f nofile.pen 2>&1 | grep "can't read file" */
-/* test: reversi.exe -f bogus.pen 2>&1 | grep 'incorrect file' */
+/* test-: reversi.exe -f nofile.pen 2>&1 | grep "can't read file" */
+/* test-: reversi.exe -f bogus.pen 2>&1 | grep 'incorrect file' */
 /* test: reversi.exe -h | grep usage */
 /* test: reversi.exe -r 2>&1 | grep 'missing' */
 /* test: reversi.exe -s 2>&1 | grep 'no scale' */
 /* test: reversi.exe -s 4 2>&1 | grep incorrect */
 /* test: reversi.exe -v 2>&1 | grep missing */
 /* test: reversi.exe _ 2>&1 | grep invalid */
-/* test: { sleep 1; echo -n s; sleep 1; echo -n kko; sleep 1; echo q; } | reversi.exe -s 3 -b 4x4 */
-/* test: { sleep 1; echo -n s; sleep 1; echo -n kkklo; sleep 1; echo q; } | reversi.exe -s 2 -b 6x6 */
-/* test: { sleep 1; echo -n s; sleep 1; echo -n kkkkllo; sleep 1; echo q; } | reversi.exe -s 1 -b 8x8 */
-/* test: { sleep 1; echo -n s; sleep 1; echo -n kkkkklllo; sleep 1; echo q; } | reversi.exe -s 0 -b 10x10 */
-/* test: { sleep 1; echo -n s; sleep 1; echo -n kkkkkkllllo; sleep 1; echo q; } | reversi.exe -b 12x12 */
-/* test: { sleep 1; echo -n s; sleep 1; echo -n kkkkkkklllllo; sleep 1; echo q; } | reversi.exe -b 14x14 */
-/* test: { sleep 1; echo -n s; sleep 1; echo -n kkkkkkkkllllllo; sleep 1; echo q; } | reversi.exe -b 16x16 */
-/* test: { for i in k k o k o m l m  o l l m j j l m l j m o m l o i i j j j o i  o l l o j  l l k o q; do echo c; sleep 1; done; } | reversi.exe -b 4x4 */
+/* test: { sleep 1; echo -n kko; sleep 1; echo q; } | reversi.exe -s 3 -b 4x4 */
+/* test: { sleep 1; echo -n kkklo; sleep 1; echo q; } | reversi.exe -s 2 -b 6x6 */
+/* test: { sleep 1; echo -n kkkkllo; sleep 1; echo q; } | reversi.exe -s 1 -b 8x8 */
+/* test: { sleep 1; echo -n kkkkklllo; sleep 1; echo q; } | reversi.exe -s 0 -b 10x10 */
+/* test: { sleep 1; echo -n kkkkkkllllo; sleep 1; echo q; } | reversi.exe -b 12x12 */
+/* test: { sleep 1; echo -n kkkkkkklllllo; sleep 1; echo q; } | reversi.exe -b 14x14 */
+/* test: { sleep 1; echo -n kkkkkkkkllllllo; sleep 1; echo q; } | reversi.exe -b 16x16 */
+/* test: { for s in kko ko ml mo lljjlljo mlmo iijjjo io llo jllko q; do echo -n $s; sleep 1; done; } | reversi.exe -b 4x4 */
 
 /* vim: set ts=4 sw=4 et: */