projects
/
platform
/
upstream
/
automake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: fix spurious failure due to localization issues
[platform/upstream/automake.git]
/
t
/
yacc-bison-skeleton-cxx.sh
diff --git
a/t/yacc-bison-skeleton-cxx.sh
b/t/yacc-bison-skeleton-cxx.sh
old mode 100755
(executable)
new mode 100644
(file)
index
f5d8545
..
54d5554
--- a/
t/yacc-bison-skeleton-cxx.sh
+++ b/
t/yacc-bison-skeleton-cxx.sh
@@
-1,5
+1,5
@@
#! /bin/sh
#! /bin/sh
-# Copyright (C) 2011-201
2
Free Software Foundation, Inc.
+# Copyright (C) 2011-201
3
Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-18,7
+18,7
@@
# For Automake bug#7648 and PR automake/491.
required='c++ bison'
# For Automake bug#7648 and PR automake/491.
required='c++ bison'
-.
./defs || Exit 1
+.
test-init.sh
cat >> configure.ac << 'END'
AC_PROG_CXX
cat >> configure.ac << 'END'
AC_PROG_CXX
@@
-40,10
+40,15
@@
END
cat > zardoz.yy << 'END'
%skeleton "lalr1.cc"
%defines
cat > zardoz.yy << 'END'
%skeleton "lalr1.cc"
%defines
+%locations
+%union
+{
+ int ival;
+};
%{
%{
-#define YYSTYPE int
-
int yylex(YYSTYPE* yylval_param
);
+int yylex (yy::parser::semantic_type *yylval,
+
yy::parser::location_type *yylloc
);
%}
%%
%}
%%
@@
-51,23
+56,22
@@
start : /* empty */
%%
int
%%
int
-yylex(YYSTYPE*)
+yylex (yy::parser::semantic_type *yylval,
+ yy::parser::location_type *yylloc)
{
{
-
return 0;
+ return 0;
}
void
}
void
-yy::parser::error(const yy::parser::location_type&, const std::string&
m
)
+yy::parser::error(const yy::parser::location_type&, const std::string&)
{
{
-
return;
+ return;
}
END
cat > foo.cc << 'END'
#include "zardoz.hh"
}
END
cat > foo.cc << 'END'
#include "zardoz.hh"
-using namespace std;
-
int
main(int argc, char** argv)
{
int
main(int argc, char** argv)
{
@@
-93,6
+97,6
@@
$MAKE
# Check that distribution is self-contained, and do not require
# bison to be built.
# Check that distribution is self-contained, and do not require
# bison to be built.
-env YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE -e distcheck
+yl_distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false'
:
: