From 30a385a7bb96a10cc137ce775e90d2f066ecc803 Mon Sep 17 00:00:00 2001 From: "David F. Skoll" Date: Sun, 5 Oct 2008 14:29:03 -0400 Subject: [PATCH] Fix bug in IsTopLevel. --- src/files.c | 2 +- tests/runinc.rem | 3 +++ tests/runtest.rem | 6 ++++++ tests/test-rem | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/runinc.rem create mode 100644 tests/runtest.rem diff --git a/src/files.c b/src/files.c index 6cda96a8..5a7438a2 100644 --- a/src/files.c +++ b/src/files.c @@ -723,7 +723,7 @@ static void DestroyCache(CachedFile *cf) /***************************************************************/ int TopLevel(void) { - return !IStackPtr; + return IStackPtr <= 1; } /***************************************************************/ diff --git a/tests/runinc.rem b/tests/runinc.rem new file mode 100644 index 00000000..715cbe07 --- /dev/null +++ b/tests/runinc.rem @@ -0,0 +1,3 @@ +set s shell("echo 3") +run on +set s shell("echo 3") diff --git a/tests/runtest.rem b/tests/runtest.rem new file mode 100644 index 00000000..24f40047 --- /dev/null +++ b/tests/runtest.rem @@ -0,0 +1,6 @@ +run off +set a shell("echo 2") +run on +set a shell("echo 2") +run off +include ../tests/runinc.rem diff --git a/tests/test-rem b/tests/test-rem index e31a0b0b..84162928 100644 --- a/tests/test-rem +++ b/tests/test-rem @@ -67,6 +67,8 @@ echo "Sort Test" >> ../tests/test.out (echo "REM AT 12:00 MSG Untimed"; echo "REM MSG Timed") | ../src/remind -gaaa - 1 Jan 2000 >> ../tests/test.out 2>&1 (echo "REM AT 12:00 MSG Untimed"; echo "REM MSG Timed") | ../src/remind -gaaad - 1 Jan 2000 >> ../tests/test.out 2>&1 +../src/remind ../tests/runtest.rem >> ../tests/test.out 2>&1 + cmp -s ../tests/test.out ../tests/test.cmp if [ "$?" = "0" ]; then echo "Remind: Acceptance test PASSED"