3 files changed, 32 insertions, 1 deletions
diff --git a/test/RegressTests.py b/test/RegressTests.py
index 1094d0d5..01e14191 100755
--- a/test/RegressTests.py
+++ b/test/RegressTests.py
@@ -100,7 +100,7 @@ class RegressFile(object):
         use_stdin = False
         if test['command'].find("-f ") != -1:
             test['command'] = '$ledger ' + test['command']
-            if test['command'].find("-f - ") != -1:
+            if re.search("-f (-|/dev/stdin)(\s|$)", test['command']):
                 use_stdin = True
         else:
             test['command'] = (('$ledger -f "%s" ' % 
diff --git a/test/regress/BF3C1F82-2.test b/test/regress/BF3C1F82-2.test
new file mode 100644
index 00000000..453151ce
--- /dev/null
+++ b/test/regress/BF3C1F82-2.test
@@ -0,0 +1,12 @@
+; Check that include directives are relative for "-f /dev/stdin"
+include non-existent-ledger-file-BF3C1F82
+test -f - reg -> 1
+__ERROR__
+While parsing file "", line 2: 
+Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
+end test
+test -f /dev/stdin reg -> 1
+__ERROR__
+While parsing file "", line 2: 
+Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
+end test
diff --git a/test/regress/BF3C1F82.test b/test/regress/BF3C1F82.test
new file mode 100644
index 00000000..50f4106f
--- /dev/null
+++ b/test/regress/BF3C1F82.test
@@ -0,0 +1,19 @@
+; Check that error reporting works for "-f -"
+
+2012/02/30 * Test
+  a  1
+  b
+test -f - reg -> 1
+__ERROR__
+While parsing file "", line 3: 
+While parsing transaction:
+<no source context>
+Error: Day of month is not valid for year
+end test
+test -f /dev/stdin reg -> 1
+__ERROR__
+While parsing file "", line 3: 
+While parsing transaction:
+<no source context>
+Error: Day of month is not valid for year
+end test