[Eliot-dev] eliot test/training_rosace.input test/training_...

[Olivier Teulière]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>       09/01/15 20:55:57

Modified files:
        test           : training_rosace.input training_rosace.ref 
        utils          : eliottxt.cpp 

Log message:
         - Echo the input in the text interface when libreadline is not 
present, so that the non-regression tests can still pass in this case.
         - Changed a bad file format in a test, and adapted the reference 
accordingly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_rosace.input?cvsroot=eliot&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_rosace.ref?cvsroot=eliot&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/eliot/utils/eliottxt.cpp?cvsroot=eliot&r1=1.30&r2=1.31

Patches:
Index: test/training_rosace.input
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_rosace.input,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4

Index: test/training_rosace.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_rosace.ref,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/training_rosace.ref    23 Nov 2008 08:33:18 -0000      1.6
+++ test/training_rosace.ref    15 Jan 2009 20:55:57 -0000      1.7
@@ -3,43 +3,24 @@
 commande> e
 mode entraînement
 [?] pour l'aide
-commande> 
 commande> t WAEROSC
-commande> 
 commande> j ROSACE H8
-commande> 
 commande> t W+TSREIN
-commande> 
 commande> j WESTERN 13G
-commande> 
 commande> t I+RDTVI?
-commande> 
 commande> j DIVeRTIR 8A
-commande> 
 commande> t ELMOEAH
-commande> 
 commande> j AH I8
-commande> 
 commande> t EELMO+PI
-commande> 
 commande> j DIPLOMEE A8
-commande> 
 commande> t OHUMJUI
-commande> 
 commande> j JOUI 12K
-commande> 
 commande> t HMU+EAUA
-commande> 
 commande> j HUE 14F
-commande> 
 commande> t AAMU+UBS
-commande> 
 commande> j SAMBA 15H
-commande> 
 commande> t UU+NYTEP
-commande> 
 commande> j TYPE O12
-commande> 
 commande> a gd # r1
  Ar 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
  Br 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00005040:
 1][00200200: 3][00200222: 1][002c4108: 1][00200222: 2][01384100: 1][01384100: 
1]
@@ -72,9 +53,7 @@
  Mc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000144:
 2][00000000:-1][00000000:-1][00080220: 2][ffffffff:-1]
  Nc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
 1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1]
  Oc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:15][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
-commande> 
 commande> t NUU+S?GE
-commande> 
 commande> a P
 Eliot
 
@@ -89,14 +68,11 @@
    UU+NYTEP    TYPE               61  O 12
 
    total                         467
-commande> 
 commande> a t
 NUUS?GE
-commande> 
 commande> a l
  A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ?
  5 1 1 2 9 2 2 0 4 0 1 4 1 5 3 0 1 3 3 3 4 1 0 1 0 1 1
-commande> 
 commande> a g
      1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
  A   -  -  -  -  -  -  -  D  I  P  L  O  M  E  E
@@ -114,7 +90,6 @@
  M   -  -  -  -  -  -  -  -  -  -  -  U  N  -  -
  N   -  -  -  -  -  -  -  -  -  -  -  I  -  -  -
  O   -  -  -  -  -  -  -  -  -  -  -  T  Y  P  E
-commande> 
 commande> a gd # r2
  Ar 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
  Br 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00005040:
 1][00200200: 3][00200222: 1][002c4108: 1][00200222: 2][01384100: 1][01384100: 
1]
@@ -147,9 +122,7 @@
  Mc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000144:
 2][00000000:-1][00000000:-1][00080220: 2][ffffffff:-1]
  Nc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
 1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1]
  Oc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:15][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
-commande> 
 commande> r
-commande> 
 commande> a r
   1: SaUGRENU        *  82 E4
   2: eNjUGUES        *  66 D8
@@ -161,7 +134,6 @@
   8: NUaGeUSE        *  64 D4
   9: GUeUSENT        *  62 F1
  10: GUEUSaNT        *  60 F1
-commande> 
 commande> a gd # r3
  Ar 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
  Br 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00005040:
 1][00200200: 3][00200222: 1][002c4108: 1][00200222: 2][01384100: 1][01384100: 
1]
@@ -194,8 +166,6 @@
  Mc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000144:
 2][00000000:-1][00000000:-1][00080220: 2][ffffffff:-1]
  Nc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
 1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1]
  Oc 
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:15][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
-commande> 
 commande> q
 fin du mode entraînement
-commande> 
 commande> q

Index: utils/eliottxt.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/utils/eliottxt.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- utils/eliottxt.cpp  30 Nov 2008 20:53:46 -0000      1.30
+++ utils/eliottxt.cpp  15 Jan 2009 20:55:57 -0000      1.31
@@ -94,6 +94,9 @@
     cout << "commande> ";
     string line;
     std::getline(cin, line);
+    // Echo the input, to behave like readline and allow playing the
+    // non-regression tests
+    cout << line << endl;
 
     // Get the needed length (we _can't_ use string::size())
     size_t len = mbstowcs(NULL, line.c_str(), 0);