# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1234162566 18000
# Node ID 6e764b7317bd843583be6660d19f236d2a269113
# Parent  39666c970996ecef406ac5072421ff79971c7674
test/fntests.m, scripts/test/demo.m: error on fopen failures

diff -r 39666c970996 -r 6e764b7317bd scripts/ChangeLog
--- a/scripts/ChangeLog	Sun Feb 08 23:00:27 2009 -0500
+++ b/scripts/ChangeLog	Mon Feb 09 01:56:06 2009 -0500
@@ -1,3 +1,7 @@
+2009-02-09  John W. Eaton  <jwe@octave.org>
+
+	* testfun/rundemos.m: Error if fopen fails.
+
 2009-02-08  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.in (install install-strip): Don't install ls-R file.
diff -r 39666c970996 -r 6e764b7317bd scripts/testfun/rundemos.m
--- a/scripts/testfun/rundemos.m	Sun Feb 08 23:00:27 2009 -0500
+++ b/scripts/testfun/rundemos.m	Mon Feb 09 01:56:06 2009 -0500
@@ -69,7 +69,11 @@
 
 function retval = has_demos (f)
   fid = fopen (f);
-  str = fscanf (fid, "%s");
-  fclose (fid);
-  retval = findstr (str, "%!demo");
+  if (f < 0)
+    error ("fopen failed: %s", f);
+  else
+    str = fscanf (fid, "%s");
+    fclose (fid);
+    retval = findstr (str, "%!demo");
+  endif
 endfunction
diff -r 39666c970996 -r 6e764b7317bd test/ChangeLog
--- a/test/ChangeLog	Sun Feb 08 23:00:27 2009 -0500
+++ b/test/ChangeLog	Mon Feb 09 01:56:06 2009 -0500
@@ -1,3 +1,7 @@
+2009-02-09  John W. Eaton  <jwe@octave.org>
+
+	* fntests.m (hastests): Error if fopen fails.
+
 2009-01-29  John W. Eaton  <jwe@octave.org>
 
 	* test_system.m: Use isfield instead of struct_contains.
diff -r 39666c970996 -r 6e764b7317bd test/fntests.m
--- a/test/fntests.m	Sun Feb 08 23:00:27 2009 -0500
+++ b/test/fntests.m	Mon Feb 09 01:56:06 2009 -0500
@@ -71,10 +71,14 @@
 ## FIXME -- should we only try match the keyword at the start of a line?
 function y = hastests (f)
   fid = fopen (f);
-  str = fread (fid, "*char")';
-  fclose (fid);
-  y = (findstr (str, "%!test") || findstr (str, "%!assert")
-       || findstr (str, "%!error") || findstr (str, "%!warning"));
+  if (fid < 0)
+    error ("fopen failed: %s", f);
+  else
+    str = fread (fid, "*char")';
+    fclose (fid);
+    y = (findstr (str, "%!test") || findstr (str, "%!assert")
+	 || findstr (str, "%!error") || findstr (str, "%!warning"));
+  endif
 endfunction
 
 function [dp, dn, dxf, dsk] = run_test_dir (fid, d);