Updated tests after the recent change of judges' messages to stderr.

diff --git a/judge/judge-tok.t b/judge/judge-tok.t
index 109c5a46cbdfdb7442ecd019b10f1496f35576e5..1bc7a8cc46079a502ae92cb5c68dbfaf3eb59540 100644 (file)
--- a/judge/judge-tok.t
+++ b/judge/judge-tok.t
@@ -1,8 +1,8 @@
-# Test cases for judge-tok.c
+# Test cases for judge-tok.c 2>&1
 
 # Identical input and output
 Name:  ok
-Run:   bin/judge-tok $1 $2
+Run:   bin/judge-tok $1 $2 2>&1
 In1:   abc d e fgh
        ijk lmn
 In2:   abc d e fgh
@@ -10,7 +10,7 @@ In2:  abc d e fgh
 
 # Differences in whitespaces are OK
 Name:  ws
-Run:   bin/judge-tok $1 $2
+Run:   bin/judge-tok $1 $2 2>&1
 In1:   abc       d e fgh  
           ijk  lmn
 In2:   abc d  e fgh
@@ -18,7 +18,7 @@ In2:  abc d  e fgh
 
 # Differences in line breaks are not
 Name:  lines1
-Run:   bin/judge-tok $1 $2
+Run:   bin/judge-tok $1 $2 2>&1
 In1:   abc  d
        e fgh  
           ijk  lmn
@@ -28,7 +28,7 @@ Exit: 1
 
 # ... unless the -n switch is given
 Name:  lines2
-Run:   bin/judge-tok -n $1 $2
+Run:   bin/judge-tok -n $1 $2 2>&1
 In1:   abc   d
        e fgh  
           ijk  lmn
@@ -37,7 +37,7 @@ In2:  abc d e fgh
 
 # Trailing empty lines are also not OK
 Name:  trail1
-Run:   echo >>$1 && bin/judge-tok $1 $2
+Run:   echo >>$1 && bin/judge-tok $1 $2 2>&1
 In1:   abc d e fgh
        ijk lmn
 In2:   abc d e fgh
@@ -46,7 +46,7 @@ Exit: 1
 
 # ... unless -t is given
 Name:  trail1
-Run:   echo >>$1 && bin/judge-tok -t $1 $2
+Run:   echo >>$1 && bin/judge-tok -t $1 $2 2>&1
 In1:   abc d e fgh
        ijk lmn
 In2:   abc d e fgh
@@ -54,7 +54,7 @@ In2:  abc d e fgh
 
 # Differences in case are not
 Name:  case1
-Run:   bin/judge-tok $1 $2
+Run:   bin/judge-tok $1 $2 2>&1
 In1:   abc d e FGH
        IJK lmn
 In2:   abc d e fgh
@@ -63,7 +63,7 @@ Exit: 1
 
 # ... unless -i is given
 Name:  case2
-Run:   bin/judge-tok -i $1 $2
+Run:   bin/judge-tok -i $1 $2 2>&1
 In1:   abc d e FGH
        IJK lmn
 In2:   abc d e fgh
@@ -71,7 +71,7 @@ In2:  abc d e fgh
 
 # By default, we compare everything literal
 Name:  real1
-Run:   bin/judge-tok $1 $2
+Run:   bin/judge-tok $1 $2 2>&1
 In1:   0.1000001
        1.
        1e-50
@@ -84,7 +84,7 @@ Exit: 1
 
 # ... but if -r is given, we allow small differences
 Name:  real2
-Run:   bin/judge-tok -r $1 $2
+Run:   bin/judge-tok -r $1 $2 2>&1
 In1:   0.1000001
        1.
        1e-50

diff --git a/judge/token.t b/judge/token.t
index 2171c5da076430850adfd775c9a0760f01cc3646..32278b693ece637e9989f2d2473334381620b90d 100644 (file)
--- a/judge/token.t
+++ b/judge/token.t
@@ -4,7 +4,7 @@
 
 # A simple test case with several spaces
 Name:  std
-Run:   bin/test-tok
+Run:   bin/test-tok 2>&1
 In:       abc   
        10  20   30
 Out:   <abc>
@@ -14,7 +14,7 @@ Out:  <abc>
 
 # The same test case in line mode
 Name:  std-l
-Run:   bin/test-tok -l
+Run:   bin/test-tok -l 2>&1
 In:       abc   
        10  20   30
 Out:   <abc>
@@ -26,31 +26,31 @@ Out:        <abc>
 
 # An unterminated line
 Name:  unterm
-Run:   tr -d '\n' | bin/test-tok
+Run:   tr -d '\n' | bin/test-tok 2>&1
 In:    abc
 Out:   <abc>
 
 # An unterminated line in line mode
 Name:  unterm-l
-Run:   tr -d '\n' | bin/test-tok -l
+Run:   tr -d '\n' | bin/test-tok -l 2>&1
 In:    abc
 Out:   <abc>
 
 # Small token size limit, but fits
 Name:  big1
-Run:   bin/test-tok -s
+Run:   bin/test-tok -s 2>&1
 In:    abcdefghijklmnop
 Out:   <abcdefghijklmnop>
 
 # Small token size limit, does not fit
 Name:  big2
-Run:   bin/test-tok -s
+Run:   bin/test-tok -s 2>&1
 In:    abcdefghijklmnopq
 Exit:  1
 
 # Testing parsers
 Name:  parse1
-Run:   bin/test-tok -vl
+Run:   bin/test-tok -vl 2>&1
 In:    abcdef
        0 5 -5
 Out:   <abcdef>
@@ -62,7 +62,7 @@ Out:  <abcdef>
 
 # More parsing: integer extremes
 Name:  parse2
-Run:   bin/test-tok -v
+Run:   bin/test-tok -v 2>&1
 In:    -2147483647 2147483647
        -2147483648 2147483648
        -4294967295 4294967295