Commit c7acb6dd authored by Paul Eggert's avatar Paul Eggert

Try to port new etags tests to MS-Windows

* test/etags/CTAGS.good, test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2, test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4, test/etags/ETAGS.good_5:
Adjust to test-case changes below.
* test/etags/Makefile (CSRC): Remove dostorture.c.
Whatever it was trying to test, wasn't working portably.
(LC_ALL): Remove.  Apparently there wasn't an encoding problem,
just a line-ending problem.
* test/etags/c-src/dostorture.c: Remove.
* test/etags/cp-src/c.C: Remove stray CR.
* test/etags/html-src/algrthms.html: Remove trailing CRs.
State UTF-8 as the encoding.  The file is ASCII so it doesn't matter,
but if someone edits it later it should stay UTF-8-compatible.
parent 18338b1d
......@@ -3580,9 +3580,7 @@ not_bol c-src/emacs/src/regex.h 391
not_eol c-src/emacs/src/regex.h 394
not_single_kboard_state c-src/emacs/src/keyboard.c /^not_single_kboard_state (KBOARD *kboard)$/
notag2 c-src/torture.c 26
notag2 c-src/dostorture.c 26
notag4 c-src/torture.c 45
notag4 c-src/dostorture.c 45
notinname c-src/etags.c /^#define notinname(c) (_nin[CHAR (c)]) \/* c is not /
npending c-src/emacs/src/keyboard.c 7244
ntool_bar_items c-src/emacs/src/keyboard.c 7974
......@@ -3737,11 +3735,8 @@ post pyt-src/server.py /^ def post(self):$/
post pyt-src/server.py /^ def post(self):$/
pot_etags_version c-src/etags.c 81
pp1 c-src/torture.c /^int pp1($/
pp1 c-src/dostorture.c /^int pp1($/
pp2 c-src/torture.c /^pp2$/
pp2 c-src/dostorture.c /^pp2$/
pp3 c-src/torture.c /^pp3(int bar)$/
pp3 c-src/dostorture.c /^pp3(int bar)$/
pp_bas_cat prol-src/natded.prolog /^pp_bas_cat(Cat):-$/
pp_cat prol-src/natded.prolog /^pp_cat(Syn:Sem):-$/
pp_exp prol-src/natded.prolog /^pp_exp('NIL'):-$/
......@@ -4118,18 +4113,12 @@ tag-re-match-p el-src/emacs/lisp/progmodes/etags.el /^(defun tag-re-match-p (re)
tag-symbol-match-p el-src/emacs/lisp/progmodes/etags.el /^(defun tag-symbol-match-p (tag)$/
tag-word-match-p el-src/emacs/lisp/progmodes/etags.el /^(defun tag-word-match-p (tag)$/
tag1 c-src/torture.c /^(*tag1 (sig, handler)) ()$/
tag1 c-src/dostorture.c /^(*tag1 (sig, handler)) ()$/
tag1 c-src/h.h 110
tag2 c-src/torture.c /^(*tag2 (sig, handler)) ()$/
tag2 c-src/dostorture.c /^(*tag2 (sig, handler)) ()$/
tag3 c-src/torture.c /^(*tag3 (int sig, void (*handler) (int))) (int)$/
tag3 c-src/dostorture.c /^(*tag3 (int sig, void (*handler) (int))) (int)$/
tag4 c-src/torture.c /^(*tag4 (int sig, void (*handler) (int))) (int)$/
tag4 c-src/dostorture.c /^(*tag4 (int sig, void (*handler) (int))) (int)$/
tag5 c-src/torture.c /^tag5 (handler, arg)$/
tag5 c-src/dostorture.c /^tag5 (handler, arg)$/
tag6 c-src/torture.c /^tag6 (void (*handler) (void *), void *arg)$/
tag6 c-src/dostorture.c /^tag6 (void (*handler) (void *), void *arg)$/
tag_or_ch c-src/emacs/src/lisp.h 3026
taggedfname c-src/etags.c 207
tags-add-tables el-src/emacs/lisp/progmodes/etags.el /^(defcustom tags-add-tables 'ask-user$/
......
......@@ -579,19 +579,6 @@ char **tab_fill(tab_fill70,1129
int tab_delete_first(91,1638
int tab_count_words(103,1820
c-src/dostorture.c,198
(*tag1 tag118,468
#define notag2 26,577
(*tag2 tag229,657
(*tag3 tag339,809
#define notag4 45,904
(*tag4 tag448,1001
tag5 57,1136
tag6 66,1272
int pp1(74,1389
pp287,1504
pp3(100,1616
c-src/emacs/src/gmalloc.c,3539
#define USE_PTHREAD25,1002
#undef get_current_dir_name33,1126
......@@ -1909,46 +1896,46 @@ template <class C, int n> class AT 52,1668
class AU 53,1716
class B<B54,1735
class B<int> { void f(B::f54,1735
const A::B::T& abt 55,1766
class A 56,1792
class A { class B A::B56,1792
class A 57,1827
A operator+(A::operator+59,1861
is_muldiv_operation(61,1888
domain foo 68,1956
void f(foo::f69,1969
void A::A(72,1990
struct A 73,2005
struct B 74,2023
void B::B(75,2042
void BE_Node::BE_Node(76,2057
class BE_Node 77,2084
struct foo 79,2103
class test 86,2157
int f(test::f87,2170
int ff(test::ff89,2232
int g(test::g90,2255
class AST_Root 92,2279
AST_ConcreteType::AST_ConcreteType(99,2394
AST_Array::AST_Array(107,2533
void f(::f115,2734
struct A 117,2754
A::~A(120,2778
struct B 122,2790
~B(B::~B123,2801
enum {dog,::dog126,2818
enum {dog, cat}::cat126,2818
enum {dog, cat} animals;126,2818
struct {int teats;} cow;127,2843
class Boo 129,2869
enum {dog,Boo::dog130,2881
enum {dog, cat}Boo::cat130,2881
foo(Boo::foo133,2955
Boo(Boo::Boo137,2996
Boo::Boo(141,3071
typedef int should_see_this_one_enclosed_in_extern_C;149,3156
typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229
typedef int should_see_this_array_type[should_see_this_array_type156,3311
const A::B::T& abt 55,1765
class A 56,1791
class A { class B A::B56,1791
class A 57,1826
A operator+(A::operator+59,1860
is_muldiv_operation(61,1887
domain foo 68,1955
void f(foo::f69,1968
void A::A(72,1989
struct A 73,2004
struct B 74,2022
void B::B(75,2041
void BE_Node::BE_Node(76,2056
class BE_Node 77,2083
struct foo 79,2102
class test 86,2156
int f(test::f87,2169
int ff(test::ff89,2231
int g(test::g90,2254
class AST_Root 92,2278
AST_ConcreteType::AST_ConcreteType(99,2393
AST_Array::AST_Array(107,2532
void f(::f115,2733
struct A 117,2753
A::~A(120,2777
struct B 122,2789
~B(B::~B123,2800
enum {dog,::dog126,2817
enum {dog, cat}::cat126,2817
enum {dog, cat} animals;126,2817
struct {int teats;} cow;127,2842
class Boo 129,2868
enum {dog,Boo::dog130,2880
enum {dog, cat}Boo::cat130,2880
foo(Boo::foo133,2954
Boo(Boo::Boo137,2995
Boo::Boo(141,3070
typedef int should_see_this_one_enclosed_in_extern_C;149,3155
typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228
typedef int should_see_this_array_type[should_see_this_array_type156,3310
cp-src/burton.cpp,103
::dummy::dummy test::dummy1(1,0
......@@ -2291,15 +2278,15 @@ Comunicati e iniziative32,976
Ultime notizie dall'associazione63,2030
html-src/algrthms.html,467
Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,282
Descriptionalgorithms10,486
Generating the Datagenalgorithm48,2000
Convolutionallyconalgorithm55,2517
Nextstatetable262,11592
Outputoutputtable350,13920
Mapping the Channel Symbolsmapping433,16218
Adding Noise to theaddnoise439,16612
Quantizing the Receivedquantizing469,19105
Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,271
Descriptionalgorithms10,472
Generating the Datagenalgorithm48,1948
Convolutionallyconalgorithm55,2458
Nextstatetable262,11326
Outputoutputtable350,13566
Mapping the Channel Symbolsmapping433,15781
Adding Noise to theaddnoise439,16169
Quantizing the Receivedquantizing469,18632
html-src/software.html,439
Francesco Potortì Software Page9,280
......
......@@ -646,19 +646,6 @@ char **tab_fill(tab_fill70,1129
int tab_delete_first(91,1638
int tab_count_words(103,1820
c-src/dostorture.c,198
(*tag1 tag118,468
#define notag2 26,577
(*tag2 tag229,657
(*tag3 tag339,809
#define notag4 45,904
(*tag4 tag448,1001
tag5 57,1136
tag6 66,1272
int pp1(74,1389
pp287,1504
pp3(100,1616
c-src/emacs/src/gmalloc.c,6643
#define USE_PTHREAD25,1002
#undef get_current_dir_name33,1126
......@@ -2415,53 +2402,53 @@ template <class C, int n> class AT 52,1668
class AU 53,1716
class B<B54,1735
class B<int> { void f(B::f54,1735
const A::B::T& abt 55,1766
class A 56,1792
class A { class B A::B56,1792
class A { class B { int f(A::B::f56,1792
class A 57,1827
int get_data(A::get_data58,1837
A operator+(A::operator+59,1861
is_muldiv_operation(61,1888
domain foo 68,1956
void f(foo::f69,1969
void A::A(72,1990
struct A 73,2005
struct A { A(A::A73,2005
struct B 74,2023
struct B { B(B::B74,2023
void B::B(75,2042
void BE_Node::BE_Node(76,2057
class BE_Node 77,2084
struct foo 79,2103
class test 86,2157
int f(test::f87,2170
int ff(test::ff89,2232
int g(test::g90,2255
class AST_Root 92,2279
class AST_Root;96,2328
AST_ConcreteType::AST_ConcreteType(99,2394
AST_Array::AST_Array(107,2533
void f(::f115,2734
struct A 117,2754
~A(A::~A118,2765
A::~A(120,2778
struct B 122,2790
~B(B::~B123,2801
enum {dog,::dog126,2818
enum {dog, cat}::cat126,2818
enum {dog, cat} animals;126,2818
struct {int teats;} cow;127,2843
class Boo 129,2869
enum {dog,Boo::dog130,2881
enum {dog, cat}Boo::cat130,2881
foo(Boo::foo133,2955
Boo(Boo::Boo137,2996
Boo(Boo::Boo138,3053
Boo::Boo(141,3071
typedef int should_see_this_one_enclosed_in_extern_C;149,3156
typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229
typedef int should_see_this_array_type[should_see_this_array_type156,3311
const A::B::T& abt 55,1765
class A 56,1791
class A { class B A::B56,1791
class A { class B { int f(A::B::f56,1791
class A 57,1826
int get_data(A::get_data58,1836
A operator+(A::operator+59,1860
is_muldiv_operation(61,1887
domain foo 68,1955
void f(foo::f69,1968
void A::A(72,1989
struct A 73,2004
struct A { A(A::A73,2004
struct B 74,2022
struct B { B(B::B74,2022
void B::B(75,2041
void BE_Node::BE_Node(76,2056
class BE_Node 77,2083
struct foo 79,2102
class test 86,2156
int f(test::f87,2169
int ff(test::ff89,2231
int g(test::g90,2254
class AST_Root 92,2278
class AST_Root;96,2327
AST_ConcreteType::AST_ConcreteType(99,2393
AST_Array::AST_Array(107,2532
void f(::f115,2733
struct A 117,2753
~A(A::~A118,2764
A::~A(120,2777
struct B 122,2789
~B(B::~B123,2800
enum {dog,::dog126,2817
enum {dog, cat}::cat126,2817
enum {dog, cat} animals;126,2817
struct {int teats;} cow;127,2842
class Boo 129,2868
enum {dog,Boo::dog130,2880
enum {dog, cat}Boo::cat130,2880
foo(Boo::foo133,2954
Boo(Boo::Boo137,2995
Boo(Boo::Boo138,3052
Boo::Boo(141,3070
typedef int should_see_this_one_enclosed_in_extern_C;149,3155
typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228
typedef int should_see_this_array_type[should_see_this_array_type156,3310
cp-src/burton.cpp,103
::dummy::dummy test::dummy1(1,0
......@@ -2858,15 +2845,15 @@ Comunicati e iniziative32,976
Ultime notizie dall'associazione63,2030
html-src/algrthms.html,467
Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,282
Descriptionalgorithms10,486
Generating the Datagenalgorithm48,2000
Convolutionallyconalgorithm55,2517
Nextstatetable262,11592
Outputoutputtable350,13920
Mapping the Channel Symbolsmapping433,16218
Adding Noise to theaddnoise439,16612
Quantizing the Receivedquantizing469,19105
Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,271
Descriptionalgorithms10,472
Generating the Datagenalgorithm48,1948
Convolutionallyconalgorithm55,2458
Nextstatetable262,11326
Outputoutputtable350,13566
Mapping the Channel Symbolsmapping433,15781
Adding Noise to theaddnoise439,16169
Quantizing the Receivedquantizing469,18632
html-src/software.html,439
Francesco Potortì Software Page9,280
......
......@@ -648,19 +648,6 @@ char **tab_fill(tab_fill70,1129
int tab_delete_first(91,1638
int tab_count_words(103,1820
c-src/dostorture.c,198
(*tag1 tag118,468
#define notag2 26,577
(*tag2 tag229,657
(*tag3 tag339,809
#define notag4 45,904
(*tag4 tag448,1001
tag5 57,1136
tag6 66,1272
int pp1(74,1389
pp287,1504
pp3(100,1616
c-src/emacs/src/gmalloc.c,4207
#define USE_PTHREAD25,1002
#undef get_current_dir_name33,1126
......@@ -2199,54 +2186,54 @@ class AU 53,1716
class AU { T x;AU::x53,1716
class B<B54,1735
class B<int> { void f(B::f54,1735
const A::B::T& abt 55,1766
class A 56,1792
class A { class B A::B56,1792
class A 57,1827
A operator+(A::operator+59,1861
is_muldiv_operation(61,1888
domain foo 68,1956
void f(foo::f69,1969
void A::A(72,1990
struct A 73,2005
struct B 74,2023
void B::B(75,2042
void BE_Node::BE_Node(76,2057
class BE_Node 77,2084
struct foo 79,2103
int x;foo::x80,2116
class test 86,2157
int f(test::f87,2170
int ff(test::ff89,2232
int g(test::g90,2255
class AST_Root 92,2279
AST_ConcreteType::AST_ConcreteType(99,2394
AST_Array::AST_Array(107,2533
void f(::f115,2734
struct A 117,2754
A::~A(120,2778
struct B 122,2790
~B(B::~B123,2801
enum {dog,::dog126,2818
enum {dog, cat}::cat126,2818
enum {dog, cat} animals;126,2818
struct {int teats;::teats127,2843
struct {int teats;} cow;127,2843
class Boo 129,2869
enum {dog,Boo::dog130,2881
enum {dog, cat}Boo::cat130,2881
enum {dog, cat} animals;Boo::animals130,2881
struct {int treats;Boo::treats131,2910
struct {int treats;} cow;Boo::cow131,2910
int i,Boo::i132,2940
int i,a,Boo::a132,2940
int i,a,b;Boo::b132,2940
foo(Boo::foo133,2955
Boo(Boo::Boo137,2996
Boo::Boo(141,3071
typedef int should_see_this_one_enclosed_in_extern_C;149,3156
typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229
typedef int should_see_this_array_type[should_see_this_array_type156,3311
const A::B::T& abt 55,1765
class A 56,1791
class A { class B A::B56,1791
class A 57,1826
A operator+(A::operator+59,1860
is_muldiv_operation(61,1887
domain foo 68,1955
void f(foo::f69,1968
void A::A(72,1989
struct A 73,2004
struct B 74,2022
void B::B(75,2041
void BE_Node::BE_Node(76,2056
class BE_Node 77,2083
struct foo 79,2102
int x;foo::x80,2115
class test 86,2156
int f(test::f87,2169
int ff(test::ff89,2231
int g(test::g90,2254
class AST_Root 92,2278
AST_ConcreteType::AST_ConcreteType(99,2393
AST_Array::AST_Array(107,2532
void f(::f115,2733
struct A 117,2753
A::~A(120,2777
struct B 122,2789
~B(B::~B123,2800
enum {dog,::dog126,2817
enum {dog, cat}::cat126,2817
enum {dog, cat} animals;126,2817
struct {int teats;::teats127,2842
struct {int teats;} cow;127,2842
class Boo 129,2868
enum {dog,Boo::dog130,2880
enum {dog, cat}Boo::cat130,2880
enum {dog, cat} animals;Boo::animals130,2880
struct {int treats;Boo::treats131,2909
struct {int treats;} cow;Boo::cow131,2909
int i,Boo::i132,2939
int i,a,Boo::a132,2939
int i,a,b;Boo::b132,2939
foo(Boo::foo133,2954
Boo(Boo::Boo137,2995
Boo::Boo(141,3070
typedef int should_see_this_one_enclosed_in_extern_C;149,3155
typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228
typedef int should_see_this_array_type[should_see_this_array_type156,3310
cp-src/burton.cpp,103
::dummy::dummy test::dummy1(1,0
......@@ -2608,15 +2595,15 @@ Comunicati e iniziative32,976
Ultime notizie dall'associazione63,2030
html-src/algrthms.html,467
Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,282
Descriptionalgorithms10,486
Generating the Datagenalgorithm48,2000
Convolutionallyconalgorithm55,2517
Nextstatetable262,11592
Outputoutputtable350,13920
Mapping the Channel Symbolsmapping433,16218
Adding Noise to theaddnoise439,16612
Quantizing the Receivedquantizing469,19105
Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,271
Descriptionalgorithms10,472
Generating the Datagenalgorithm48,1948
Convolutionallyconalgorithm55,2458
Nextstatetable262,11326
Outputoutputtable350,13566
Mapping the Channel Symbolsmapping433,15781
Adding Noise to theaddnoise439,16169
Quantizing the Receivedquantizing469,18632
html-src/software.html,439
Francesco Potortì Software Page9,280
......
......@@ -603,19 +603,6 @@ char **tab_fill(tab_fill70,1129
int tab_delete_first(91,1638
int tab_count_words(103,1820
c-src/dostorture.c,198
(*tag1 tag118,468
#define notag2 26,577
(*tag2 tag229,657
(*tag3 tag339,809
#define notag4 45,904
(*tag4 tag448,1001
tag5 57,1136
tag6 66,1272
int pp1(74,1389
pp287,1504
pp3(100,1616
c-src/emacs/src/gmalloc.c,3539
#define USE_PTHREAD25,1002
#undef get_current_dir_name33,1126
......@@ -2073,46 +2060,46 @@ template <class C, int n> class AT 52,1668
class AU 53,1716
class B<B54,1735
class B<int> { void f(B::f54,1735
const A::B::T& abt 55,1766
class A 56,1792
class A { class B A::B56,1792
class A 57,1827
A operator+(A::operator+59,1861
is_muldiv_operation(61,1888
domain foo 68,1956
void f(foo::f69,1969
void A::A(72,1990
struct A 73,2005
struct B 74,2023
void B::B(75,2042
void BE_Node::BE_Node(76,2057
class BE_Node 77,2084
struct foo 79,2103
class test 86,2157
int f(test::f87,2170
int ff(test::ff89,2232
int g(test::g90,2255
class AST_Root 92,2279
AST_ConcreteType::AST_ConcreteType(99,2394
AST_Array::AST_Array(107,2533
void f(::f115,2734
struct A 117,2754
A::~A(120,2778
struct B 122,2790
~B(B::~B123,2801
enum {dog,::dog126,2818
enum {dog, cat}::cat126,2818
enum {dog, cat} animals;126,2818
struct {int teats;} cow;127,2843
class Boo 129,2869
enum {dog,Boo::dog130,2881
enum {dog, cat}Boo::cat130,2881
foo(Boo::foo133,2955
Boo(Boo::Boo137,2996
Boo::Boo(141,3071
typedef int should_see_this_one_enclosed_in_extern_C;149,3156
typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229
typedef int should_see_this_array_type[should_see_this_array_type156,3311
const A::B::T& abt 55,1765
class A 56,1791
class A { class B A::B56,1791
class A 57,1826
A operator+(A::operator+59,1860
is_muldiv_operation(61,1887
domain foo 68,1955
void f(foo::f69,1968
void A::A(72,1989
struct A 73,2004
struct B 74,2022
void B::B(75,2041
void BE_Node::BE_Node(76,2056
class BE_Node 77,2083
struct foo 79,2102
class test 86,2156
int f(test::f87,2169
int ff(test::ff89,2231
int g(test::g90,2254
class AST_Root 92,2278
AST_ConcreteType::AST_ConcreteType(99,2393
AST_Array::AST_Array(107,2532
void f(::f115,2733
struct A 117,2753
A::~A(120,2777
struct B 122,2789
~B(B::~B123,2800
enum {dog,::dog126,2817
enum {dog, cat}::cat126,2817
enum {dog, cat} animals;126,2817
struct {int teats;} cow;127,2842
class Boo 129,2868
enum {dog,Boo::dog130,2880
enum {dog, cat}Boo::cat130,2880
foo(Boo::foo133,2954
Boo(Boo::Boo137,2995
Boo::Boo(141,3070
typedef int should_see_this_one_enclosed_in_extern_C;149,3155
typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228
typedef int should_see_this_array_type[should_see_this_array_type156,3310