[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp src/ui/terminal/ChangeLog src/ui/terminal/...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp src/ui/terminal/ChangeLog src/ui/terminal/... |
|
Date: |
Tue, 07 Nov 2006 13:00:00 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 06/11/07 13:00:00
Modified files:
src/ui/terminal: ChangeLog command-line.c main.c msg-ui.c
msg-ui.h
tests/bugs : agg_crash.sh big-input-2.sh big-input.sh
curtailed.sh data-crash.sh examine-missing.sh
if_crash.sh input-crash.sh print-crash.sh
t-test.sh terminate.sh val-labs.sh
tests/command : aggregate.sh erase.sh loop.sh match-files.sh
missing-values.sh print.sh rank.sh
very-long-strings.sh
Log message:
Committed patch #5524, which allows the message destination to be
set on the command line.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/ChangeLog?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/command-line.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/main.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/msg-ui.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/msg-ui.h?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/agg_crash.sh?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/big-input-2.sh?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/big-input.sh?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/curtailed.sh?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/data-crash.sh?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/examine-missing.sh?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/if_crash.sh?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/input-crash.sh?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/print-crash.sh?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/t-test.sh?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/terminate.sh?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/val-labs.sh?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/aggregate.sh?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/erase.sh?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/loop.sh?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/match-files.sh?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/missing-values.sh?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/print.sh?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/rank.sh?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/very-long-strings.sh?cvsroot=pspp&r1=1.2&r2=1.3
Patches:
Index: src/ui/terminal/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/ui/terminal/ChangeLog 4 Nov 2006 23:49:35 -0000 1.14
+++ src/ui/terminal/ChangeLog 7 Nov 2006 12:59:59 -0000 1.15
@@ -1,3 +1,8 @@
+Tue Nov 7 20:54:32 WST 2006 John Darrington <address@hidden>
+
+ * command-line.c msg-ui.c msg-ui.h main.c: Added an -e
+ option to set the file for error messages.
+
Sat Nov 4 15:48:04 2006 Ben Pfaff <address@hidden>
* msg-ui.c (handle_msg): Only write message to terminal if
Index: src/ui/terminal/command-line.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/command-line.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/ui/terminal/command-line.c 8 Jul 2006 03:05:52 -0000 1.6
+++ src/ui/terminal/command-line.c 7 Nov 2006 12:59:59 -0000 1.7
@@ -19,6 +19,7 @@
#include <config.h>
#include "command-line.h"
+#include "msg-ui.h"
#include <libpspp/message.h>
#include <ctype.h>
#include <stdio.h>
@@ -62,6 +63,7 @@
{"device", required_argument, NULL, 'o'},
{"dry-run", no_argument, NULL, 'n'},
{"edit", no_argument, NULL, 'n'},
+ {"error-file", required_argument, NULL, 'e'},
{"help", no_argument, NULL, 'h'},
{"include-directory", required_argument, NULL, 'I'},
{"interactive", no_argument, NULL, 'i'},
@@ -89,7 +91,7 @@
for (;;)
{
- c = getopt_long (argc, argv, "a:x:B:c:f:hiI:lno:prsvV", long_options,
NULL);
+ c = getopt_long (argc, argv, "a:x:B:c:e:f:hiI:lno:prsvV", long_options,
NULL);
if (c == -1)
break;
@@ -119,7 +121,9 @@
return false;
}
break;
-
+ case 'e':
+ msg_ui_set_error_file (optarg);
+ break;
case 'B':
config_path = optarg;
break;
@@ -223,6 +227,7 @@
" -B, --config-dir=DIR set configuration directory to DIR\n"
" -o, --device=DEVICE select output driver DEVICE and disable
defaults\n"
"\nInput and output:\n"
+" -e, --error-file=FILE send error messages to FILE (appended)\n"
" -f, --out-file=FILE send output to FILE (overwritten)\n"
" -p, --pipe read script from stdin, send output to stdout\n"
" -I-, --no-include clear include path\n"
Index: src/ui/terminal/main.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/ui/terminal/main.c 3 Nov 2006 04:53:52 -0000 1.18
+++ src/ui/terminal/main.c 7 Nov 2006 12:59:59 -0000 1.19
@@ -90,7 +90,6 @@
fmt_init ();
outp_init ();
- msg_ui_init ();
fn_init ();
fh_init ();
getl_initialize ();
@@ -101,6 +100,7 @@
if (parse_command_line (argc, argv))
{
+ msg_ui_init ();
outp_read_devices ();
lex_init (do_read_line);
Index: src/ui/terminal/msg-ui.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/msg-ui.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/ui/terminal/msg-ui.c 4 Nov 2006 23:49:35 -0000 1.4
+++ src/ui/terminal/msg-ui.c 7 Nov 2006 12:59:59 -0000 1.5
@@ -27,6 +27,7 @@
#include <language/line-buffer.h>
#include <data/settings.h>
#include <libpspp/message.h>
+#include <errno.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -35,12 +36,35 @@
/* Number of errors, warnings reported. */
static int error_count;
static int warning_count;
+static const char *error_file;
static void handle_msg (const struct msg *);
+static FILE *msg_file;
+
+void
+msg_ui_set_error_file (const char *filename)
+{
+ error_file = filename;
+}
+
void
msg_ui_init (void)
{
+ msg_file = stdout;
+
+ if ( error_file )
+ {
+ msg_file = fopen (error_file, "a");
+ if ( NULL == msg_file )
+ {
+ int err = errno;
+ printf ( _("Cannot open %s (%s). "
+ "Writing errors to stdout instead.\n"),
+ error_file, strerror(err) );
+ msg_file = stdout;
+ }
+ }
msg_init (handle_msg, get_msg_location);
}
@@ -48,6 +72,7 @@
msg_ui_done (void)
{
msg_done ();
+ fclose (msg_file);
}
@@ -141,8 +166,8 @@
ds_put_cstr (&string, m->text);
- if (get_error_routing_to_terminal ())
- dump_message (ds_cstr (&string), get_viewwidth (), 8, stdout);
+ if (msg_file != stdout || get_error_routing_to_terminal ())
+ dump_message (ds_cstr (&string), get_viewwidth (), 8, msg_file);
ds_destroy (&string);
}
Index: src/ui/terminal/msg-ui.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/msg-ui.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/ui/terminal/msg-ui.h 25 Apr 2006 18:03:03 -0000 1.1
+++ src/ui/terminal/msg-ui.h 7 Nov 2006 12:59:59 -0000 1.2
@@ -22,6 +22,7 @@
#include <stdbool.h>
+void msg_ui_set_error_file (const char *filename);
void msg_ui_init (void);
void msg_ui_done (void);
void check_msg_count (void);
Index: tests/bugs/agg_crash.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/agg_crash.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/bugs/agg_crash.sh 11 Mar 2006 07:16:40 -0000 1.6
+++ tests/bugs/agg_crash.sh 7 Nov 2006 12:59:59 -0000 1.7
@@ -72,7 +72,7 @@
# So this will have a non zero error status.
# But it shouldn't crash!
activity="run_program"
-$SUPERVISOR $PSPP $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
Index: tests/bugs/big-input-2.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/big-input-2.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tests/bugs/big-input-2.sh 11 Mar 2006 07:16:40 -0000 1.10
+++ tests/bugs/big-input-2.sh 7 Nov 2006 12:59:59 -0000 1.11
@@ -79,7 +79,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
activity="appending to data"
@@ -88,7 +88,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
pass;
Index: tests/bugs/big-input.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/big-input.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/bugs/big-input.sh 11 Mar 2006 07:16:40 -0000 1.7
+++ tests/bugs/big-input.sh 7 Nov 2006 12:59:59 -0000 1.8
@@ -71,7 +71,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/foo.sps > /dev/null
+$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TEMPDIR/foo.sps
if [ $? -ne 0 ] ; then fail ; fi
pass;
Index: tests/bugs/curtailed.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/curtailed.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/bugs/curtailed.sh 11 Mar 2006 07:16:40 -0000 1.5
+++ tests/bugs/curtailed.sh 7 Nov 2006 12:59:59 -0000 1.6
@@ -70,7 +70,7 @@
#This must fail
activity="run program"
-$SUPERVISOR $PSPP $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
Index: tests/bugs/data-crash.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/data-crash.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tests/bugs/data-crash.sh 11 Mar 2006 07:16:40 -0000 1.8
+++ tests/bugs/data-crash.sh 7 Nov 2006 13:00:00 -0000 1.9
@@ -63,8 +63,7 @@
#This must fail
activity="run program"
-$SUPERVISOR $PSPP $TEMPDIR/ct.stat > /dev/null
+$SUPERVISOR $PSPP -e /dev/null $TEMPDIR/ct.stat
if [ $? -ne 1 ] ; then fail ; fi
-
pass;
Index: tests/bugs/examine-missing.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/examine-missing.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/bugs/examine-missing.sh 3 Apr 2006 20:07:54 -0000 1.4
+++ tests/bugs/examine-missing.sh 7 Nov 2006 13:00:00 -0000 1.5
@@ -70,7 +70,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null 2>&1
+$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE 2> /dev/null
if [ $? -ne 0 ] ; then fail ; fi
pass;
Index: tests/bugs/if_crash.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/if_crash.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/bugs/if_crash.sh 11 Mar 2006 07:16:40 -0000 1.5
+++ tests/bugs/if_crash.sh 7 Nov 2006 13:00:00 -0000 1.6
@@ -76,7 +76,7 @@
# So this will have a non zero error status.
# But it shouldn't crash!
activity="run_program"
-$SUPERVISOR $PSPP $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
Index: tests/bugs/input-crash.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/input-crash.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/bugs/input-crash.sh 11 Mar 2006 07:16:40 -0000 1.5
+++ tests/bugs/input-crash.sh 7 Nov 2006 13:00:00 -0000 1.6
@@ -73,7 +73,7 @@
# The above syntax is invalid, so this program should fail to parse
activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
Index: tests/bugs/print-crash.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/print-crash.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/bugs/print-crash.sh 25 May 2006 10:29:14 -0000 1.1
+++ tests/bugs/print-crash.sh 7 Nov 2006 13:00:00 -0000 1.2
@@ -68,7 +68,7 @@
activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
Index: tests/bugs/t-test.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/t-test.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/bugs/t-test.sh 11 Mar 2006 07:16:40 -0000 1.7
+++ tests/bugs/t-test.sh 7 Nov 2006 13:00:00 -0000 1.8
@@ -73,7 +73,7 @@
#The syntax was invalid. Therefore pspp must return non zero.
activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
pass;
Index: tests/bugs/terminate.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/terminate.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/bugs/terminate.sh 31 Jul 2005 04:55:58 -0000 1.4
+++ tests/bugs/terminate.sh 7 Nov 2006 13:00:00 -0000 1.5
@@ -66,7 +66,7 @@
activity="run program"
# This must exit with non zero status
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/foo.sps > /dev/null 2>
$TEMPDIR/stderr
+$SUPERVISOR $here/../src/pspp -o raw-ascii -e /dev/null $TEMPDIR/foo.sps 2>
$TEMPDIR/stderr
if [ $? -eq 0 ] ; then fail ; fi
activity="compare stderr"
Index: tests/bugs/val-labs.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/bugs/val-labs.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/bugs/val-labs.sh 11 Mar 2006 07:16:40 -0000 1.7
+++ tests/bugs/val-labs.sh 7 Nov 2006 13:00:00 -0000 1.8
@@ -73,7 +73,7 @@
#Invalid syntax --- return value is non zero.
activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
pass;
Index: tests/command/aggregate.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/aggregate.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- tests/command/aggregate.sh 11 Mar 2006 07:16:40 -0000 1.16
+++ tests/command/aggregate.sh 7 Nov 2006 13:00:00 -0000 1.17
@@ -206,7 +206,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
- $SUPERVISOR $PSPP --testing-mode -o raw-ascii $name.pspp >/dev/null
2>&1
+ $SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null
$name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
Index: tests/command/erase.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/erase.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/command/erase.sh 11 Mar 2006 07:16:40 -0000 1.7
+++ tests/command/erase.sh 7 Nov 2006 13:00:00 -0000 1.8
@@ -77,7 +77,7 @@
# This command must fail
activity="run prog 1"
-$SUPERVISOR $PSPP $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -e /dev/null $TESTFILE
if [ $? -eq 0 ] ; then fail ; fi
Index: tests/command/loop.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/loop.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/command/loop.sh 30 May 2006 12:01:34 -0000 1.15
+++ tests/command/loop.sh 7 Nov 2006 13:00:00 -0000 1.16
@@ -73,7 +73,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TEMPDIR/loop.stat >
$TEMPDIR/stdout
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/stdout
$TEMPDIR/loop.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare stdout"
Index: tests/command/match-files.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/match-files.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/command/match-files.sh 11 Mar 2006 07:16:40 -0000 1.9
+++ tests/command/match-files.sh 7 Nov 2006 13:00:00 -0000 1.10
@@ -165,7 +165,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
- $SUPERVISOR $PSPP -o raw-ascii $name.pspp >/dev/null 2>&1
+ $SUPERVISOR $PSPP -o raw-ascii -e /dev/null $name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
@@ -190,7 +190,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
-$SUPERVISOR $PSPP -o raw-ascii $name.pspp >/dev/null 2>&1
+$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
@@ -239,7 +239,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
-$SUPERVISOR $PSPP -o raw-ascii $name.pspp >/dev/null 2>&1
+$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
Index: tests/command/missing-values.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/missing-values.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/command/missing-values.sh 26 Apr 2006 20:54:08 -0000 1.4
+++ tests/command/missing-values.sh 7 Nov 2006 13:00:00 -0000 1.5
@@ -109,7 +109,7 @@
activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode
$TEMPDIR/missing-values.stat > $TEMPDIR/errs
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode
--error-file=$TEMPDIR/errs $TEMPDIR/missing-values.stat
# Note vv --- there are errors in input. Therefore, the command must FAIL
if [ $? -eq 0 ] ; then fail ; fi
Index: tests/command/print.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/print.sh,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- tests/command/print.sh 29 Oct 2006 00:01:53 -0000 1.26
+++ tests/command/print.sh 7 Nov 2006 13:00:00 -0000 1.27
@@ -101,7 +101,7 @@
activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode
$TEMPDIR/print.stat > $TEMPDIR/errs
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode
--error-file=$TEMPDIR/errs $TEMPDIR/print.stat
if [ $? -ne 0 ] ; then fail ; fi
activity="compare print.out"
Index: tests/command/rank.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/rank.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/command/rank.sh 7 Oct 2006 03:10:14 -0000 1.1
+++ tests/command/rank.sh 7 Nov 2006 13:00:00 -0000 1.2
@@ -81,7 +81,7 @@
# Check that it properly handles failed transformations.
activity="run program 1"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > $TEMPDIR/err
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/err $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
activity="diff 1"
@@ -135,7 +135,7 @@
activity="run program (syntax errors)"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > $TEMPDIR/errs
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/errs $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
activity="compare errors"
@@ -534,7 +534,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program 4"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
Index: tests/command/very-long-strings.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/very-long-strings.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/command/very-long-strings.sh 29 Oct 2006 00:01:53 -0000 1.2
+++ tests/command/very-long-strings.sh 7 Nov 2006 13:00:00 -0000 1.3
@@ -71,7 +71,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program 0"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
activity="compare variable display 0"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp src/ui/terminal/ChangeLog src/ui/terminal/...,
John Darrington <=