test/: Add default values for configuration variables

Add a small helper script called "test-init.sh" that is sourced in each
test case and initializes the CALCURSE and DATA_DIR environment
variables.

Update the test suite README to point out that setting these environment
variables is no longer required.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>

test/README

@@ -16,13 +16,8 @@ when all tests are finished.
 
 You can also run tests manually. Test cases are usually shell scripts or
 binaries. To run an individual test, just invoke the corresponding executable.
-Note that some tests require the `CALCURSE` and `DATA_DIR` environment
+The `CALCURSE` and `DATA_DIR` environment variables can be used to specify an
-variables to be set, where `CALCURSE` should point to a valid calcurse binary
+alternative calcurse binary and data directory.
-and `DATA_DIR` should point to a valid data directory. We usually use the data
-directory `data/`, which is contained in the `test/` directory, for test cases:
-
-    $ CALCURSE=../src/calcurse DATA_DIR=data/ ./next-001.sh
-    Running ./next-001.sh... ok
 
 Passing another data directory might cause some failures since many tests are
 adapted for the `test/` directory provided by the test suite:

test/appointment-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ ! -x "$(command -v faketime)" ]; then
   echo "libfaketime not found - skipping $0..."
   exit 0

test/appointment-002.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-002" \
     -d02/23/2013

test/appointment-003.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-003" \
     -d02/23/2013

test/appointment-004.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-004" \
     -d02/23/2013

test/appointment-005.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-005" \
     -d02/23/2013

test/appointment-006.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-006" \
     -d02/23/2013

test/appointment-007.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-007" \
     -d02/23/2013

test/appointment-008.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-008" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in the item date' errors

test/appointment-009.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-009" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'date error in appointment' errors

test/appointment-010.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-010" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'no event nor appointment found' errors

test/appointment-011.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-011" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item time or duration' errors

test/appointment-012.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-012" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'date error in appointment' errors

test/appointment-013.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-013" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item time or duration' errors

test/appointment-014.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-014" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item time or duration' errors

test/appointment-015.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-015" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item time or duration' errors

test/appointment-016.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-016" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'date error in appointment' errors

test/appointment-017.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-017" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item time or duration' errors

test/appointment-018.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-018" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item time or duration' errors

test/appointment-019.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-019" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'date error in appointment' errors

test/appointment-020.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-020" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item repetition' errors

test/appointment-021.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-021" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'date error in appointment' errors

test/appointment-022.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-appointment-022" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'date error in appointment' errors

test/bug-002.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-bug-002" \
     -d05/03/2012

test/day-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -d02/25/2011
 elif [ "$1" = 'expected' ]; then

test/day-002.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ ! -x "$(command -v faketime)" ]; then
   echo "libfaketime not found - skipping $0..."
   exit 0

test/day-003.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ ! -x "$(command -v faketime)" ]; then
   echo "libfaketime not found - skipping $0..."
   exit 0

test/event-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-event-001" \
     -d02/23/2013

test/event-002.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-event-002" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in the item date' errors

test/event-003.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-event-003" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'date error in event' errors

test/event-004.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-event-004" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'no event nor appointment found' errors

test/event-005.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-event-005" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item identifier' errors

test/event-006.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-event-006" \
   -d02/23/2013 2>errors && exit 1
 grep -Fq 'syntax error in item identifier' errors

test/next-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ ! -x "$(command -v faketime)" ]; then
   echo "libfaketime not found - skipping $0..."
   exit 0

test/range-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ ! -x "$(command -v faketime)" ]; then
   echo "libfaketime not found - skipping $0..."
   exit 0

test/range-002.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ ! -x "$(command -v faketime)" ]; then
   echo "libfaketime not found - skipping $0..."
   exit 0

test/range-003.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ ! -x "$(command -v faketime)" ]; then
   echo "libfaketime not found - skipping $0..."
   exit 0

test/recur-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-recur" \
     -s01/01/2000 -r8 --format-recur-apt=''

test/recur-002.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-recur" \
     -d02/01/2000 --format-recur-apt=''

test/recur-003.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-recur" \
     -d01/01/2001 --format-recur-apt=''

test/recur-004.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-recur" \
     -d01/01/2000 --format-recur-event=''

test/recur-005.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -c "$DATA_DIR/apts-recur" \
     -d01/10/2000 --format-recur-event=''

test/run-test-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' -o "$1" = 'expected' ]; then
   echo 42
 else

test/run-test-002.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   echo 23
 elif [ "$1" = 'expected' ]; then

test/search-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ ! -x "$(command -v faketime)" ]; then
   echo "libfaketime not found - skipping $0..."
   exit 0

test/test-init.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+CALCURSE=${CALCURSE:-../src/calcurse}
+DATA_DIR=${DATA_DIR:-data/}

test/todo-001.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -t | sort
 elif [ "$1" = 'expected' ]; then

test/todo-002.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -t3
 elif [ "$1" = 'expected' ]; then

test/todo-003.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 if [ "$1" = 'actual' ]; then
   "$CALCURSE" --read-only -D "$DATA_DIR"/ -t0 | sort -n
 elif [ "$1" = 'expected' ]; then

test/true-001.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 
+. ./test-init.sh
+
 true