diff -Nru libdap-3.20.4/aclocal.m4 libdap-3.20.5/aclocal.m4 --- libdap-3.20.4/aclocal.m4 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/aclocal.m4 2020-02-17 07:35:45.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -418,6 +418,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -526,7 +532,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -534,7 +581,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -664,38 +710,6 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -766,6 +780,70 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. diff -Nru libdap-3.20.4/ce_expr.tab.cc libdap-3.20.5/ce_expr.tab.cc --- libdap-3.20.4/ce_expr.tab.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/ce_expr.tab.cc 2020-02-17 07:35:45.000000000 +0000 @@ -62,7 +62,8 @@ /* Pull parsers. */ #define YYPULL 1 - +/* Substitute the type names. */ +#define YYSTYPE CE_EXPRSTYPE /* Substitute the variable and function names. */ #define yyparse ce_exprparse #define yylex ce_exprlex @@ -99,10 +100,18 @@ #ifndef YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED # define YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED /* Debug traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif +#ifndef CE_EXPRDEBUG +# if defined YYDEBUG #if YYDEBUG +# define CE_EXPRDEBUG 1 +# else +# define CE_EXPRDEBUG 0 +# endif +# else /* ! defined YYDEBUG */ +# define CE_EXPRDEBUG 1 +# endif /* ! defined YYDEBUG */ +#endif /* ! defined CE_EXPRDEBUG */ +#if CE_EXPRDEBUG extern int ce_exprdebug; #endif /* "%code requires" blocks. */ @@ -160,6 +169,7 @@ #define EVALUATOR(arg) (static_cast(arg)->get_eval()) #define DDS(arg) (static_cast(arg)->get_dds()) +#define YYERROR_VERBOSE 0 // #define YYPARSE_PARAM arg int ce_exprlex(void); /* the scanner; see expr.lex */ @@ -202,12 +212,12 @@ rvalue *build_constant_array(vector *values, DDS *dds); -#line 206 "ce_expr.tab.cc" /* yacc.c:352 */ +#line 216 "ce_expr.tab.cc" /* yacc.c:352 */ /* Token type. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - enum yytokentype +#ifndef CE_EXPRTOKENTYPE +# define CE_EXPRTOKENTYPE + enum ce_exprtokentype { SCAN_STR = 258, SCAN_WORD = 259, @@ -230,11 +240,11 @@ #endif /* Value type. */ -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +#if ! defined CE_EXPRSTYPE && ! defined CE_EXPRSTYPE_IS_DECLARED -union YYSTYPE +union CE_EXPRSTYPE { -#line 145 "ce_expr.yy" /* yacc.c:352 */ +#line 146 "ce_expr.yy" /* yacc.c:352 */ bool boolean; int op; @@ -267,16 +277,16 @@ libdap::rvalue *rval_ptr; libdap::rvalue_list *r_val_l_ptr; -#line 271 "ce_expr.tab.cc" /* yacc.c:352 */ +#line 281 "ce_expr.tab.cc" /* yacc.c:352 */ }; -typedef union YYSTYPE YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define YYSTYPE_IS_DECLARED 1 +typedef union CE_EXPRSTYPE CE_EXPRSTYPE; +# define CE_EXPRSTYPE_IS_TRIVIAL 1 +# define CE_EXPRSTYPE_IS_DECLARED 1 #endif -extern YYSTYPE ce_exprlval; +extern CE_EXPRSTYPE ce_exprlval; int ce_exprparse (ce_parser_arg *arg); @@ -284,13 +294,13 @@ /* Unqualified %code blocks. */ -#line 232 "ce_expr.yy" /* yacc.c:355 */ +#line 233 "ce_expr.yy" /* yacc.c:355 */ /* This global is used by the rule 'arg_length_hint' so that the hint can be used during the paraent rule's parse. See fast_int32_arg_list. */ unsigned long arg_length_hint_value = 0; -#line 294 "ce_expr.tab.cc" /* yacc.c:355 */ +#line 304 "ce_expr.tab.cc" /* yacc.c:355 */ #ifdef short # undef short @@ -462,7 +472,7 @@ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined CE_EXPRSTYPE_IS_TRIVIAL && CE_EXPRSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -576,23 +586,23 @@ 15, 16, 17, 18, 19 }; -#if YYDEBUG +#if CE_EXPRDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 241, 241, 247, 249, 249, 253, 259, 260, 266, - 278, 282, 286, 310, 316, 322, 328, 334, 340, 346, - 355, 366, 370, 377, 384, 388, 395, 402, 406, 413, - 420, 424, 431, 438, 442, 449, 456, 460, 467, 474, - 478, 485, 492, 514, 515, 521, 530, 541, 548, 562, - 563, 573, 577, 583, 590, 599, 604, 609, 647, 671, - 684, 690, 699, 705, 716, 721, 735, 739, 753, 762, - 769, 781, 792, 807, 823, 824, 825, 826, 827, 828, - 829 + 0, 242, 242, 248, 250, 250, 254, 260, 261, 267, + 279, 283, 287, 311, 317, 323, 329, 335, 341, 347, + 356, 367, 371, 378, 385, 389, 396, 403, 407, 414, + 421, 425, 432, 439, 443, 450, 457, 461, 468, 475, + 479, 486, 493, 515, 516, 522, 531, 542, 549, 563, + 564, 574, 578, 584, 591, 600, 605, 610, 648, 672, + 685, 691, 700, 706, 717, 722, 736, 740, 754, 763, + 770, 782, 793, 808, 824, 825, 826, 827, 828, 829, + 830 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || 0 +#if CE_EXPRDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -829,7 +839,7 @@ /* Enable debugging if requested. */ -#if YYDEBUG +#if CE_EXPRDEBUG # ifndef YYFPRINTF # include /* INFRINGES ON USER NAME SPACE */ @@ -951,12 +961,12 @@ /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; -#else /* !YYDEBUG */ +#else /* !CE_EXPRDEBUG */ # define YYDPRINTF(Args) # define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ +#endif /* !CE_EXPRDEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ @@ -1477,47 +1487,47 @@ switch (yyn) { case 2: -#line 241 "ce_expr.yy" /* yacc.c:1652 */ +#line 242 "ce_expr.yy" /* yacc.c:1667 */ { DBG(cerr << "Mark all variables" << endl); DDS(arg)->mark_all(true); (yyval.boolean) = true; } -#line 1487 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1497 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 4: -#line 249 "ce_expr.yy" /* yacc.c:1652 */ +#line 250 "ce_expr.yy" /* yacc.c:1667 */ { DDS(arg)->mark_all(true); } -#line 1493 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1503 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 5: -#line 250 "ce_expr.yy" /* yacc.c:1652 */ +#line 251 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[0].boolean); } -#line 1501 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1511 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 6: -#line 254 "ce_expr.yy" /* yacc.c:1652 */ +#line 255 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean); } -#line 1509 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1519 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 8: -#line 261 "ce_expr.yy" /* yacc.c:1652 */ +#line 262 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean); } -#line 1517 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1527 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 9: -#line 267 "ce_expr.yy" /* yacc.c:1652 */ +#line 268 "ce_expr.yy" /* yacc.c:1667 */ { BaseType *var = DDS(arg)->var((yyvsp[0].id)); if (var) { @@ -1529,27 +1539,27 @@ no_such_ident(arg, (yyvsp[0].id), "identifier"); } } -#line 1533 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1543 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 10: -#line 279 "ce_expr.yy" /* yacc.c:1652 */ +#line 280 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[0].boolean); } -#line 1541 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1551 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 11: -#line 283 "ce_expr.yy" /* yacc.c:1652 */ +#line 284 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[0].boolean); } -#line 1549 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1559 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 12: -#line 287 "ce_expr.yy" /* yacc.c:1652 */ +#line 288 "ce_expr.yy" /* yacc.c:1667 */ { Array *array = dynamic_cast((yyvsp[0].rval_ptr)->bvalue(*DDS(arg))); if (array) { @@ -1567,67 +1577,67 @@ return false; } } -#line 1571 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1581 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 13: -#line 311 "ce_expr.yy" /* yacc.c:1652 */ +#line 312 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = build_constant_array((yyvsp[-1].byte_values), DDS(arg)); } -#line 1579 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1589 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 14: -#line 317 "ce_expr.yy" /* yacc.c:1652 */ +#line 318 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = build_constant_array((yyvsp[-1].int16_values), DDS(arg)); } -#line 1587 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1597 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 15: -#line 323 "ce_expr.yy" /* yacc.c:1652 */ +#line 324 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = build_constant_array((yyvsp[-1].uint16_values), DDS(arg)); } -#line 1595 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1605 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 16: -#line 329 "ce_expr.yy" /* yacc.c:1652 */ +#line 330 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = build_constant_array((yyvsp[-1].int32_values), DDS(arg)); } -#line 1603 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1613 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 17: -#line 335 "ce_expr.yy" /* yacc.c:1652 */ +#line 336 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = build_constant_array((yyvsp[-1].uint32_values), DDS(arg)); } -#line 1611 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1621 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 18: -#line 341 "ce_expr.yy" /* yacc.c:1652 */ +#line 342 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = build_constant_array((yyvsp[-1].float32_values), DDS(arg)); } -#line 1619 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1629 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 19: -#line 347 "ce_expr.yy" /* yacc.c:1652 */ +#line 348 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = build_constant_array((yyvsp[-1].float64_values), DDS(arg)); } -#line 1627 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1637 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 20: -#line 356 "ce_expr.yy" /* yacc.c:1652 */ +#line 357 "ce_expr.yy" /* yacc.c:1667 */ { if (!check_int32((yyvsp[0].id))) throw Error(malformed_expr, "$(hint, value, ...) special form expected hint to be an integer"); @@ -1635,179 +1645,179 @@ arg_length_hint_value = atoi((yyvsp[0].id)); (yyval.boolean) = true; } -#line 1639 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1649 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 21: -#line 367 "ce_expr.yy" /* yacc.c:1652 */ +#line 368 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.byte_values) = make_fast_arg_list(arg_length_hint_value, (yyvsp[0].byte_value)); } -#line 1647 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1657 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 22: -#line 371 "ce_expr.yy" /* yacc.c:1652 */ +#line 372 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.byte_values) = make_fast_arg_list((yyvsp[-2].byte_values), (yyvsp[0].byte_value)); } -#line 1655 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1665 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 23: -#line 378 "ce_expr.yy" /* yacc.c:1652 */ +#line 379 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.byte_value) = strtol((yyvsp[0].id), 0, 0); } -#line 1663 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1673 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 24: -#line 385 "ce_expr.yy" /* yacc.c:1652 */ +#line 386 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.int16_values) = make_fast_arg_list(arg_length_hint_value, (yyvsp[0].int16_value)); } -#line 1671 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1681 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 25: -#line 389 "ce_expr.yy" /* yacc.c:1652 */ +#line 390 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.int16_values) = make_fast_arg_list((yyvsp[-2].int16_values), (yyvsp[0].int16_value)); } -#line 1679 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1689 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 26: -#line 396 "ce_expr.yy" /* yacc.c:1652 */ +#line 397 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.int16_value) = strtol((yyvsp[0].id), 0, 0); } -#line 1687 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1697 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 27: -#line 403 "ce_expr.yy" /* yacc.c:1652 */ +#line 404 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.uint16_values) = make_fast_arg_list(arg_length_hint_value, (yyvsp[0].uint16_value)); } -#line 1695 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1705 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 28: -#line 407 "ce_expr.yy" /* yacc.c:1652 */ +#line 408 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.uint16_values) = make_fast_arg_list((yyvsp[-2].uint16_values), (yyvsp[0].uint16_value)); } -#line 1703 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1713 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 29: -#line 414 "ce_expr.yy" /* yacc.c:1652 */ +#line 415 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.uint16_value) = strtoul((yyvsp[0].id), 0, 0); } -#line 1711 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1721 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 30: -#line 421 "ce_expr.yy" /* yacc.c:1652 */ +#line 422 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.int32_values) = make_fast_arg_list(arg_length_hint_value, (yyvsp[0].int32_value)); } -#line 1719 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1729 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 31: -#line 425 "ce_expr.yy" /* yacc.c:1652 */ +#line 426 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.int32_values) = make_fast_arg_list((yyvsp[-2].int32_values), (yyvsp[0].int32_value)); } -#line 1727 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1737 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 32: -#line 432 "ce_expr.yy" /* yacc.c:1652 */ +#line 433 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.int32_value) = strtol((yyvsp[0].id), 0, 0); } -#line 1735 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1745 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 33: -#line 439 "ce_expr.yy" /* yacc.c:1652 */ +#line 440 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.uint32_values) = make_fast_arg_list(arg_length_hint_value, (yyvsp[0].uint32_value)); } -#line 1743 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1753 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 34: -#line 443 "ce_expr.yy" /* yacc.c:1652 */ +#line 444 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.uint32_values) = make_fast_arg_list((yyvsp[-2].uint32_values), (yyvsp[0].uint32_value)); } -#line 1751 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1761 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 35: -#line 450 "ce_expr.yy" /* yacc.c:1652 */ +#line 451 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.uint32_value) = strtoul((yyvsp[0].id), 0, 0); } -#line 1759 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1769 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 36: -#line 457 "ce_expr.yy" /* yacc.c:1652 */ +#line 458 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.float32_values) = make_fast_arg_list(arg_length_hint_value, (yyvsp[0].float32_value)); } -#line 1767 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1777 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 37: -#line 461 "ce_expr.yy" /* yacc.c:1652 */ +#line 462 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.float32_values) = make_fast_arg_list((yyvsp[-2].float32_values), (yyvsp[0].float32_value)); } -#line 1775 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1785 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 38: -#line 468 "ce_expr.yy" /* yacc.c:1652 */ +#line 469 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.float32_value) = strtof((yyvsp[0].id), 0); } -#line 1783 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1793 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 39: -#line 475 "ce_expr.yy" /* yacc.c:1652 */ +#line 476 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.float64_values) = make_fast_arg_list(arg_length_hint_value, (yyvsp[0].float64_value)); } -#line 1791 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1801 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 40: -#line 479 "ce_expr.yy" /* yacc.c:1652 */ +#line 480 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.float64_values) = make_fast_arg_list((yyvsp[-2].float64_values), (yyvsp[0].float64_value)); } -#line 1799 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1809 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 41: -#line 486 "ce_expr.yy" /* yacc.c:1652 */ +#line 487 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.float64_value) = strtod((yyvsp[0].id), 0); } -#line 1807 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1817 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 42: -#line 493 "ce_expr.yy" /* yacc.c:1652 */ +#line 494 "ce_expr.yy" /* yacc.c:1667 */ { proj_func p_f = 0; btp_func f = 0; @@ -1827,19 +1837,19 @@ no_such_func(arg, (yyvsp[-3].id)); } } -#line 1831 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1841 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 44: -#line 516 "ce_expr.yy" /* yacc.c:1652 */ +#line 517 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean); } -#line 1839 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1849 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 45: -#line 522 "ce_expr.yy" /* yacc.c:1652 */ +#line 523 "ce_expr.yy" /* yacc.c:1667 */ { if ((yyvsp[-4].rval_ptr)) { EVALUATOR(arg)->append_clause((yyvsp[-3].op), (yyvsp[-4].rval_ptr), (yyvsp[-1].r_val_l_ptr)); @@ -1848,11 +1858,11 @@ else (yyval.boolean) = false; } -#line 1852 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1862 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 46: -#line 531 "ce_expr.yy" /* yacc.c:1652 */ +#line 532 "ce_expr.yy" /* yacc.c:1667 */ { if ((yyvsp[-2].rval_ptr)) { rvalue_list *rv = new rvalue_list; @@ -1863,19 +1873,19 @@ else (yyval.boolean) = false; } -#line 1867 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1877 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 47: -#line 542 "ce_expr.yy" /* yacc.c:1652 */ +#line 543 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[0].boolean); } -#line 1875 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1885 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 48: -#line 549 "ce_expr.yy" /* yacc.c:1652 */ +#line 550 "ce_expr.yy" /* yacc.c:1667 */ { bool_func b_func = get_function((*EVALUATOR(arg)), (yyvsp[-3].id)); if (!b_func) { @@ -1886,11 +1896,11 @@ (yyval.boolean) = true; } } -#line 1890 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1900 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 50: -#line 564 "ce_expr.yy" /* yacc.c:1652 */ +#line 565 "ce_expr.yy" /* yacc.c:1667 */ { btp_func func = get_btp_function((*EVALUATOR(arg)), (yyvsp[-3].id)); if (func) { @@ -1900,65 +1910,65 @@ no_such_func(arg, (yyvsp[-3].id)); } } -#line 1904 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1914 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 51: -#line 574 "ce_expr.yy" /* yacc.c:1652 */ +#line 575 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = (yyvsp[0].rval_ptr); } -#line 1912 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1922 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 52: -#line 578 "ce_expr.yy" /* yacc.c:1652 */ +#line 579 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.rval_ptr) = (yyvsp[0].rval_ptr); } -#line 1920 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1930 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 53: -#line 584 "ce_expr.yy" /* yacc.c:1652 */ +#line 585 "ce_expr.yy" /* yacc.c:1667 */ { if ((yyvsp[0].rval_ptr)) (yyval.r_val_l_ptr) = make_rvalue_list((yyvsp[0].rval_ptr)); else (yyval.r_val_l_ptr) = 0; } -#line 1931 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1941 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 54: -#line 591 "ce_expr.yy" /* yacc.c:1652 */ +#line 592 "ce_expr.yy" /* yacc.c:1667 */ { if ((yyvsp[-2].r_val_l_ptr) && (yyvsp[0].rval_ptr)) (yyval.r_val_l_ptr) = append_rvalue_list((yyvsp[-2].r_val_l_ptr), (yyvsp[0].rval_ptr)); else (yyval.r_val_l_ptr) = 0; } -#line 1942 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1952 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 55: -#line 600 "ce_expr.yy" /* yacc.c:1652 */ +#line 601 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.r_val_l_ptr) = (yyvsp[0].r_val_l_ptr); } -#line 1950 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1960 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 56: -#line 604 "ce_expr.yy" /* yacc.c:1652 */ +#line 605 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.r_val_l_ptr) = 0; } -#line 1958 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 1968 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 57: -#line 610 "ce_expr.yy" /* yacc.c:1652 */ +#line 611 "ce_expr.yy" /* yacc.c:1667 */ { BaseType *btp = DDS(arg)->var(www2id((yyvsp[0].id))); if (btp) { @@ -1996,11 +2006,11 @@ (yyval.rval_ptr) = new rvalue(btp); } } -#line 2000 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2010 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 58: -#line 648 "ce_expr.yy" /* yacc.c:1652 */ +#line 649 "ce_expr.yy" /* yacc.c:1667 */ { if ((yyvsp[0].val).type != dods_str_c || (yyvsp[0].val).v.s == 0 || (yyvsp[0].val).v.s->empty()) ce_exprerror(arg, "Malformed string", ""); @@ -2019,11 +2029,11 @@ // See ticket 2240. jhrg 7/30/14 delete (yyvsp[0].val).v.s; } -#line 2023 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2033 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 59: -#line 672 "ce_expr.yy" /* yacc.c:1652 */ +#line 673 "ce_expr.yy" /* yacc.c:1667 */ { if (!bracket_projection((*DDS(arg)), (yyvsp[-1].id), (yyvsp[0].int_ll_ptr))) no_such_ident(arg, (yyvsp[-1].id), "array, grid or sequence"); @@ -2034,19 +2044,19 @@ DDS(arg)->mark((yyvsp[-1].id), true); (yyval.rval_ptr) = new rvalue(DDS(arg)->var((yyvsp[-1].id))); } -#line 2038 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2048 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 60: -#line 685 "ce_expr.yy" /* yacc.c:1652 */ +#line 686 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.boolean) = (*DDS(arg)).mark((yyvsp[0].id), true); } -#line 2046 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2056 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 61: -#line 691 "ce_expr.yy" /* yacc.c:1652 */ +#line 692 "ce_expr.yy" /* yacc.c:1667 */ { //string name = www2id($1); if (!bracket_projection((*DDS(arg)), (yyvsp[-1].id), (yyvsp[0].int_ll_ptr))) @@ -2055,21 +2065,21 @@ strncpy((yyval.id), (yyvsp[-1].id), ID_MAX-1); (yyval.id)[ID_MAX-1] = '\0'; } -#line 2059 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2069 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 62: -#line 700 "ce_expr.yy" /* yacc.c:1652 */ +#line 701 "ce_expr.yy" /* yacc.c:1667 */ { string name = string((yyvsp[-1].id)) + string((yyvsp[0].id)); strncpy((yyval.id), name.c_str(), ID_MAX-1); (yyval.id)[ID_MAX-1] = '\0'; } -#line 2069 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2079 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 63: -#line 706 "ce_expr.yy" /* yacc.c:1652 */ +#line 707 "ce_expr.yy" /* yacc.c:1667 */ { string name = string((yyvsp[-2].id)) + string((yyvsp[-1].id)); if (!bracket_projection((*DDS(arg)), name.c_str(), (yyvsp[0].int_ll_ptr))) @@ -2078,20 +2088,20 @@ strncpy((yyval.id), name.c_str(), ID_MAX-1); (yyval.id)[ID_MAX-1] = '\0'; } -#line 2082 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2092 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 64: -#line 717 "ce_expr.yy" /* yacc.c:1652 */ +#line 718 "ce_expr.yy" /* yacc.c:1667 */ { strncpy((yyval.id), www2id((yyvsp[0].id)).c_str(), ID_MAX-1); (yyval.id)[ID_MAX-1] = '\0'; } -#line 2091 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2101 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 65: -#line 722 "ce_expr.yy" /* yacc.c:1652 */ +#line 723 "ce_expr.yy" /* yacc.c:1667 */ { if ((yyvsp[0].val).type != dods_str_c || (yyvsp[0].val).v.s == 0 || (yyvsp[0].val).v.s->empty()) ce_exprerror(arg, "Malformed string", ""); @@ -2103,27 +2113,27 @@ (yyval.id)[ID_MAX-1] = '\0'; } -#line 2107 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2117 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 66: -#line 736 "ce_expr.yy" /* yacc.c:1652 */ +#line 737 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.int_ll_ptr) = make_array_indices((yyvsp[0].int_l_ptr)); } -#line 2115 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2125 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 67: -#line 740 "ce_expr.yy" /* yacc.c:1652 */ +#line 741 "ce_expr.yy" /* yacc.c:1667 */ { (yyval.int_ll_ptr) = append_array_index((yyvsp[-1].int_ll_ptr), (yyvsp[0].int_l_ptr)); } -#line 2123 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2133 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 68: -#line 754 "ce_expr.yy" /* yacc.c:1652 */ +#line 755 "ce_expr.yy" /* yacc.c:1667 */ { if (!check_uint32((yyvsp[-1].id))) throw Error(malformed_expr, "The word `" + string((yyvsp[-1].id)) + "' is not a valid array index."); @@ -2132,22 +2142,22 @@ i.v.i = atoi((yyvsp[-1].id)); (yyval.int_l_ptr) = make_array_index(i); } -#line 2136 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2146 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 69: -#line 763 "ce_expr.yy" /* yacc.c:1652 */ +#line 764 "ce_expr.yy" /* yacc.c:1667 */ { value i; i.type = dods_int32_c; i.v.i =-1; (yyval.int_l_ptr) = make_array_index(i); } -#line 2147 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2157 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 70: -#line 770 "ce_expr.yy" /* yacc.c:1652 */ +#line 771 "ce_expr.yy" /* yacc.c:1667 */ { if (!check_uint32((yyvsp[-3].id))) throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index."); @@ -2159,11 +2169,11 @@ j.v.i = atoi((yyvsp[-1].id)); (yyval.int_l_ptr) = make_array_index(i, j); } -#line 2163 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2173 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 71: -#line 782 "ce_expr.yy" /* yacc.c:1652 */ +#line 783 "ce_expr.yy" /* yacc.c:1667 */ { if (!check_uint32((yyvsp[-3].id))) throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index."); @@ -2174,11 +2184,11 @@ j.v.i = -1; (yyval.int_l_ptr) = make_array_index(i, j); } -#line 2178 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2188 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 72: -#line 793 "ce_expr.yy" /* yacc.c:1652 */ +#line 794 "ce_expr.yy" /* yacc.c:1667 */ { if (!check_uint32((yyvsp[-5].id))) throw Error(malformed_expr, "The word `" + string((yyvsp[-5].id)) + "' is not a valid array index."); @@ -2193,11 +2203,11 @@ k.v.i = atoi((yyvsp[-1].id)); (yyval.int_l_ptr) = make_array_index(i, j, k); } -#line 2197 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2207 "ce_expr.tab.cc" /* yacc.c:1667 */ break; case 73: -#line 808 "ce_expr.yy" /* yacc.c:1652 */ +#line 809 "ce_expr.yy" /* yacc.c:1667 */ { if (!check_uint32((yyvsp[-5].id))) throw Error(malformed_expr, "The word `" + string((yyvsp[-5].id)) + "' is not a valid array index."); @@ -2211,11 +2221,11 @@ k.v.i = -1; (yyval.int_l_ptr) = make_array_index(i, j, k); } -#line 2215 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2225 "ce_expr.tab.cc" /* yacc.c:1667 */ break; -#line 2219 "ce_expr.tab.cc" /* yacc.c:1652 */ +#line 2229 "ce_expr.tab.cc" /* yacc.c:1667 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2446,7 +2456,7 @@ #endif return yyresult; } -#line 832 "ce_expr.yy" /* yacc.c:1918 */ +#line 833 "ce_expr.yy" /* yacc.c:1918 */ // All these error reporting function now throw instances of Error. The expr diff -Nru libdap-3.20.4/ce_expr.tab.hh libdap-3.20.5/ce_expr.tab.hh --- libdap-3.20.4/ce_expr.tab.hh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/ce_expr.tab.hh 2020-02-17 07:35:45.000000000 +0000 @@ -37,14 +37,22 @@ #ifndef YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED # define YY_CE_EXPR_CE_EXPR_TAB_HH_INCLUDED /* Debug traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif +#ifndef CE_EXPRDEBUG +# if defined YYDEBUG #if YYDEBUG +# define CE_EXPRDEBUG 1 +# else +# define CE_EXPRDEBUG 0 +# endif +# else /* ! defined YYDEBUG */ +# define CE_EXPRDEBUG 1 +# endif /* ! defined YYDEBUG */ +#endif /* ! defined CE_EXPRDEBUG */ +#if CE_EXPRDEBUG extern int ce_exprdebug; #endif /* "%code requires" blocks. */ -#line 41 "ce_expr.yy" /* yacc.c:1921 */ +#line 41 "ce_expr.yy" /* yacc.c:1927 */ #include "config.h" @@ -98,6 +106,7 @@ #define EVALUATOR(arg) (static_cast(arg)->get_eval()) #define DDS(arg) (static_cast(arg)->get_dds()) +#define YYERROR_VERBOSE 0 // #define YYPARSE_PARAM arg int ce_exprlex(void); /* the scanner; see expr.lex */ @@ -140,12 +149,12 @@ rvalue *build_constant_array(vector *values, DDS *dds); -#line 144 "ce_expr.tab.hh" /* yacc.c:1921 */ +#line 153 "ce_expr.tab.hh" /* yacc.c:1927 */ /* Token type. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - enum yytokentype +#ifndef CE_EXPRTOKENTYPE +# define CE_EXPRTOKENTYPE + enum ce_exprtokentype { SCAN_STR = 258, SCAN_WORD = 259, @@ -168,11 +177,11 @@ #endif /* Value type. */ -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +#if ! defined CE_EXPRSTYPE && ! defined CE_EXPRSTYPE_IS_DECLARED -union YYSTYPE +union CE_EXPRSTYPE { -#line 145 "ce_expr.yy" /* yacc.c:1921 */ +#line 146 "ce_expr.yy" /* yacc.c:1927 */ bool boolean; int op; @@ -205,16 +214,16 @@ libdap::rvalue *rval_ptr; libdap::rvalue_list *r_val_l_ptr; -#line 209 "ce_expr.tab.hh" /* yacc.c:1921 */ +#line 218 "ce_expr.tab.hh" /* yacc.c:1927 */ }; -typedef union YYSTYPE YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define YYSTYPE_IS_DECLARED 1 +typedef union CE_EXPRSTYPE CE_EXPRSTYPE; +# define CE_EXPRSTYPE_IS_TRIVIAL 1 +# define CE_EXPRSTYPE_IS_DECLARED 1 #endif -extern YYSTYPE ce_exprlval; +extern CE_EXPRSTYPE ce_exprlval; int ce_exprparse (ce_parser_arg *arg); diff -Nru libdap-3.20.4/ce_expr.yy libdap-3.20.5/ce_expr.yy --- libdap-3.20.4/ce_expr.yy 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/ce_expr.yy 2020-02-17 07:35:45.000000000 +0000 @@ -91,6 +91,7 @@ #define EVALUATOR(arg) (static_cast(arg)->get_eval()) #define DDS(arg) (static_cast(arg)->get_dds()) +#define YYERROR_VERBOSE 0 // #define YYPARSE_PARAM arg int ce_exprlex(void); /* the scanner; see expr.lex */ @@ -137,7 +138,7 @@ %require "2.4" %parse-param {ce_parser_arg *arg} -%name-prefix "ce_expr" +%define api.prefix {ce_expr} %defines %debug %verbose diff -Nru libdap-3.20.4/ChangeLog libdap-3.20.5/ChangeLog --- libdap-3.20.4/ChangeLog 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/ChangeLog 2020-02-17 07:35:45.000000000 +0000 @@ -1,3 +1,175 @@ +2020-01-09 ndp-opendap + + updating aws keys for travis + +2019-12-13 kyang2014 + + Merge pull request #105 from OPENDAP/hk-532 + HK-532, set the parent pointer of vars to NULL when transforming DAP4… + +2019-12-12 Muqun Yang + + HK-532, set the parent pointer of vars to NULL when transforming DAP4 to DAP2. + +2019-12-06 Sam Lloyd + + Merge pull request #104 from OPENDAP/HK-50 + Hk 50 + +2019-12-06 Samuel Lloyd + + 12/6/19 - HK-50 - master merge + +2019-12-05 James Gallagher + + Removed unneeded include directories + [skip ci] + + Added local CMakeLists.txt to streamline work with CLion. + [skip ci] + +2019-12-04 slloyd + + 12/4/19 - HK-50 - (In Progress) returns changed + +2019-12-03 James Gallagher + + Merge pull request #103 from OPENDAP/HK-459 + 11/26/19 - HK-459 - (Awaiting Review) suppressed .yy error messages + +2019-11-27 James Gallagher + + Prepare for merge + + Set custom condition for ci_test + + Testing 'test deployment' + + Modified ci_test stage + + Reset keys + + Test new AWS keys + +2019-11-26 slloyd + + 11/26/19 - HK-459 - (Awaiting Review) suppressed .yy error messages + suppressed error messages thrown from libdap4/*.yy files to the standard + out + +2019-11-01 James Gallagher + + My update of the Ubuntu container failed; modified the deb-build script. + The script now loads the awscli code. It would be better to fix the + docker container, but I don't have easy access to the Dockerfile. + + Updated the ubuntu 14 container so it has the aws cli. + + Modified build-deb.sh to use the aws cli. + This change was needed because the travis.build bucket is no longer + public. + +2019-10-31 James Gallagher + + Merge pull request #102 from OPENDAP/dap4-function-null-args-support + Added support for null argument lists to the DAP4 function parser. + + Added support for null argument lists to the DAP4 function parser. + +2019-10-30 James Gallagher + + Fix for the deb-to-package-dir.sh script. + + Merge pull request #101 from OPENDAP/travis + Travis + + Added srcdist to the travis build + +2019-10-29 James Gallagher + + More clean up and configured to build on the travis branch + + Clean up the travis.yml + +2019-10-01 James Gallagher + + Changed scan stage so sonarcloud is an 'object' + +2019-09-30 James Gallagher + + Changed name-prefix to api.prefix + +2019-09-25 James Gallagher + + Syntax fixes in travis.yml and a new target in Makefile.am for CLion + To make CLion work with our code I used the compiledb tool to make + a data base of built files. I added a target to the Makefile.am to + support that. + [skip ci] + +2019-09-08 James Gallagher + + Merge pull request #99 from OPENDAP/dmr-test-fix + Dmr test fix + +2019-09-04 slloyd + + 9/4/19 - HK-411 - (Awaiting Review) implemented remaining DMRTest fixes + +2019-08-27 Nathan Potter + + Fixing broken naming of rpm's, again. + + Fixing the missong devel and debuginfo snaps + + Testing snapshot gen in travis, tweaking target names + + Testing snapshot gen in travis + + Testing snapshot gen in travis + + Merge branch 'master' of https://github.com/opendap/libdap4 + + Testing snapshot gen in travis + +2019-08-26 Kodi Neumiller + + Merge pull request #98 from OPENDAP/authorization_fix + Cleanup and Verbose + + Made it easier to set the verbose for HTTPConnect and added a very verbose option. + + Merge pull request #97 from OPENDAP/authorization_fix + Fixed netrc authorization + +2019-08-23 Kodi Neumiller + + Took out the curlopt_username and curlopt_password + + Fixed netrc authorization + +2019-07-08 James Gallagher + + Added DOI + [skip ci] + +2019-07-03 James Gallagher + + Merge branch 'master' of https://github.com/opendap/libdap4 + Resolved Conflicts: chunked_istream.cc + +2019-07-02 James Gallagher + + Merge pull request #96 from OPENDAP/header-byte-order-hack + Hacked chunked_i/ostream.cc using HEADER_IN_NETWORK_BYTE_ORDER + + Revert "Fixes to ntohl() use and auto_ptr --> unique_ptr." + This reverts commit c8c427b01dd95ff2f0da820630ffc8133d77d0aa. + + Hacked chunked_i/ostream.cc using HEADER_IN_NETWORK_BYTE_ORDER + This is an attempt to revert edits made to correct the calls + to htonl() adn ntohl(). Most thought is needed. + 2019-07-01 James Gallagher Merge pull request #95 from OPENDAP/scan-fixes Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._compile and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._compile differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._config.guess and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._config.guess differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._config.sub and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._config.sub differ diff -Nru libdap-3.20.4/conf/config.sub libdap-3.20.5/conf/config.sub --- libdap-3.20.4/conf/config.sub 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/conf/config.sub 2020-02-17 07:35:45.000000000 +0000 @@ -1006,7 +1006,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._depcomp and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._depcomp differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._install-sh and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._install-sh differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._libtool.m4 and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._libtool.m4 differ diff -Nru libdap-3.20.4/conf/libtool.m4 libdap-3.20.5/conf/libtool.m4 --- libdap-3.20.4/conf/libtool.m4 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/conf/libtool.m4 2020-02-17 07:35:45.000000000 +0000 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,31 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +747,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +798,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,9 +1386,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1417,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1363,19 +1438,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1383,7 +1459,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1392,7 +1468,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1408,7 +1484,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1427,11 +1503,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1439,7 +1515,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1470,7 +1546,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1506,7 +1582,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1533,7 +1609,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1555,7 +1631,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1574,10 +1650,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1598,7 +1674,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1638,7 +1714,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1688,22 +1764,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1719,7 +1796,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1747,7 +1824,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1794,9 +1871,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1822,7 +1899,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1843,7 +1920,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1853,44 +1930,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1899,21 +1984,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1923,7 +2008,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1933,9 +2018,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2027,8 +2112,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2038,8 +2123,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2066,8 +2151,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2079,15 +2164,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2101,12 +2186,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2130,7 +2215,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2148,6 +2233,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2158,17 +2284,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2184,28 +2311,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2219,7 +2353,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2228,7 +2362,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2245,14 +2379,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2260,41 +2397,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2304,18 +2491,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2323,8 +2510,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2336,7 +2523,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2345,8 +2532,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2362,17 +2549,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2381,8 +2568,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2409,7 +2596,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2422,8 +2609,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2436,7 +2623,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2449,8 +2636,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2463,8 +2650,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2482,12 +2669,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2512,26 +2700,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2549,14 +2726,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2564,8 +2742,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2574,8 +2752,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2588,8 +2766,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2600,7 +2778,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2608,8 +2786,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2628,8 +2806,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2638,13 +2816,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2669,14 +2867,15 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2693,12 +2892,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2708,7 +2907,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2717,58 +2916,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2779,8 +2988,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2790,11 +2999,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2802,8 +3011,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2824,24 +3033,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2859,7 +3068,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2867,8 +3076,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2877,20 +3086,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2923,39 +3142,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2978,11 +3199,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3000,7 +3221,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3027,16 +3248,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3050,7 +3271,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3061,37 +3282,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3177,13 +3435,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3210,8 +3468,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3247,10 +3504,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3289,7 +3542,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3311,8 +3564,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3365,6 +3618,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3405,33 +3661,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3442,21 +3703,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3464,8 +3725,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3511,8 +3772,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3524,7 +3785,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3551,13 +3812,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3569,11 +3845,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3592,7 +3868,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3644,7 +3920,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3677,14 +3953,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3702,21 +4008,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3756,11 +4065,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3786,7 +4095,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3806,9 +4115,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3829,7 +4138,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3856,12 +4165,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3877,17 +4190,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3898,8 +4212,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3915,6 +4229,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3964,7 +4283,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4005,14 +4324,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4041,7 +4360,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4049,7 +4368,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4194,17 +4513,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4215,8 +4535,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4233,6 +4553,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4303,7 +4628,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4311,11 +4636,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4331,7 +4675,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4340,9 +4684,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4367,6 +4711,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4464,7 +4814,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4493,7 +4843,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4559,17 +4909,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4615,9 +4969,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4633,7 +4987,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4641,7 +4995,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4651,7 +5005,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4673,24 +5027,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4703,7 +5057,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4722,7 +5076,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4738,7 +5092,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4748,7 +5102,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4756,61 +5110,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4821,42 +5203,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4870,8 +5257,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4889,8 +5276,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4902,7 +5289,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4917,9 +5304,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4936,15 +5323,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4960,7 +5347,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4968,34 +5355,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5014,13 +5424,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5039,61 +5457,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5102,7 +5539,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5132,16 +5569,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5150,18 +5588,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5170,7 +5608,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5220,33 +5658,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5254,25 +5692,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5280,14 +5718,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5298,7 +5736,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5309,16 +5747,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5331,21 +5769,31 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5360,7 +5808,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5368,27 +5816,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5399,33 +5839,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5436,24 +5896,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5463,11 +5923,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5477,10 +5937,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5529,43 +5989,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5580,17 +6040,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5607,7 +6067,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5687,12 +6147,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5733,10 +6193,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5776,18 +6236,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5795,8 +6255,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5804,13 +6268,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5818,14 +6282,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5867,7 +6331,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5909,35 +6373,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5973,18 +6437,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -5994,6 +6470,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6012,13 +6495,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6036,64 +6527,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6103,7 +6614,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6131,57 +6642,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6192,6 +6704,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6226,18 +6766,15 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6249,7 +6786,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6258,11 +6795,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6272,15 +6809,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6306,13 +6843,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6323,20 +6860,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6351,22 +6888,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6375,22 +6912,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6398,8 +6935,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6408,10 +6945,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6425,59 +6962,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6491,18 +7028,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6510,10 +7047,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6571,22 +7108,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6602,9 +7134,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6622,17 +7154,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6647,21 +7179,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6707,9 +7239,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6717,7 +7249,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6734,30 +7266,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6765,11 +7297,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6778,52 +7310,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6854,10 +7386,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6884,7 +7416,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6906,13 +7438,14 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6996,13 +7529,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7018,16 +7551,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7035,9 +7568,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7052,15 +7585,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7091,51 +7624,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7144,7 +7632,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7164,10 +7652,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7204,7 +7692,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7226,7 +7714,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7240,21 +7728,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7262,11 +7754,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7283,9 +7775,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7295,11 +7787,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7336,7 +7828,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7358,7 +7850,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7374,21 +7866,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7396,11 +7892,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7420,7 +7916,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7430,7 +7926,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7464,7 +7960,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7501,7 +7997,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7535,7 +8031,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7572,7 +8068,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7588,7 +8084,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7598,7 +8094,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7627,7 +8123,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7738,7 +8234,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7755,9 +8251,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7781,27 +8277,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7825,102 +8301,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._ltmain.sh and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._ltmain.sh differ diff -Nru libdap-3.20.4/conf/ltmain.sh libdap-3.20.5/conf/ltmain.sh --- libdap-3.20.4/conf/ltmain.sh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/conf/ltmain.sh 2020-02-17 07:35:45.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._lt~obsolete.m4 and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._lt~obsolete.m4 differ diff -Nru libdap-3.20.4/conf/lt~obsolete.m4 libdap-3.20.5/conf/lt~obsolete.m4 --- libdap-3.20.4/conf/lt~obsolete.m4 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/conf/lt~obsolete.m4 2020-02-17 07:35:45.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._ltoptions.m4 and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._ltoptions.m4 differ diff -Nru libdap-3.20.4/conf/ltoptions.m4 libdap-3.20.5/conf/ltoptions.m4 --- libdap-3.20.4/conf/ltoptions.m4 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/conf/ltoptions.m4 2020-02-17 07:35:45.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._ltsugar.m4 and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._ltsugar.m4 differ diff -Nru libdap-3.20.4/conf/ltsugar.m4 libdap-3.20.5/conf/ltsugar.m4 --- libdap-3.20.4/conf/ltsugar.m4 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/conf/ltsugar.m4 2020-02-17 07:35:45.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._ltversion.m4 and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._ltversion.m4 differ diff -Nru libdap-3.20.4/conf/ltversion.m4 libdap-3.20.5/conf/ltversion.m4 --- libdap-3.20.4/conf/ltversion.m4 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/conf/ltversion.m4 2020-02-17 07:35:45.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._missing and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._missing differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/conf/._test-driver and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/conf/._test-driver differ diff -Nru libdap-3.20.4/config.h.in libdap-3.20.5/config.h.in --- libdap-3.20.4/config.h.in 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/config.h.in 2020-02-17 07:35:45.000000000 +0000 @@ -882,8 +882,7 @@ slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ @@ -908,9 +907,6 @@ /* Define this to suppres assert() calls. */ #undef NDEBUG -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -Nru libdap-3.20.4/configure libdap-3.20.5/configure --- libdap-3.20.4/configure 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/configure 2020-02-17 07:35:45.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libdap 3.20.4. +# Generated by GNU Autoconf 2.69 for libdap 3.20.5. # # Report bugs to . # @@ -650,8 +650,8 @@ # Identity of this package. PACKAGE_NAME='libdap' PACKAGE_TARNAME='libdap' -PACKAGE_VERSION='3.20.4' -PACKAGE_STRING='libdap 3.20.4' +PACKAGE_VERSION='3.20.5' +PACKAGE_STRING='libdap 3.20.5' PACKAGE_BUGREPORT='opendap-tech@opendap.org' PACKAGE_URL='' @@ -1257,6 +1257,7 @@ ac_word_order YACC CXXCPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -1411,6 +1412,7 @@ enable_static with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -1440,6 +1442,7 @@ CC CFLAGS CPP +LT_SYS_LIBRARY_PATH CXXCPP PKG_CONFIG TIRPC_CFLAGS @@ -1990,7 +1993,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libdap 3.20.4 to adapt to many kinds of systems. +\`configure' configures libdap 3.20.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2060,7 +2063,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libdap 3.20.4:";; + short | recursive ) echo "Configuration of libdap 3.20.5:";; esac cat <<\_ACEOF @@ -2100,9 +2103,12 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib --without-libpth-prefix don't search for libpth in includedir and libdir @@ -2127,6 +2133,8 @@ CC C compiler command CFLAGS C compiler flags CPP C preprocessor + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility TIRPC_CFLAGS @@ -2207,7 +2215,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libdap configure 3.20.4 +libdap configure 3.20.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3037,7 +3045,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libdap $as_me 3.20.4, which was +It was created by libdap $as_me 3.20.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3458,7 +3466,7 @@ -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3944,7 +3952,7 @@ # Define the identity of the package. PACKAGE='libdap' - VERSION='3.20.4' + VERSION='3.20.5' cat >>confdefs.h <<_ACEOF @@ -3995,6 +4003,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi ac_config_commands="$ac_config_commands tests/atconfig" @@ -5419,6 +5468,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -6323,131 +6431,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : @@ -7102,8 +7085,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -7117,7 +7100,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within # double-quoted strings. @@ -7166,7 +7149,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -7359,19 +7342,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -7385,7 +7368,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -7396,7 +7379,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -7407,32 +7390,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -7475,33 +7458,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -7512,15 +7500,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -7626,9 +7614,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -7636,8 +7624,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -7677,7 +7665,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -7717,7 +7705,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -7767,22 +7755,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -7800,7 +7789,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -7818,30 +7807,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -7964,13 +7929,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -8098,13 +8063,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -8131,8 +8096,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -8168,10 +8132,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -8210,7 +8170,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -8232,8 +8192,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -8286,6 +8246,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -8443,8 +8406,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -8456,7 +8419,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -8610,7 +8573,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -8618,7 +8581,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -8631,7 +8594,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -8848,7 +8811,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -8938,7 +8901,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -8971,14 +8934,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -8996,21 +8989,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -9058,11 +9054,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -9088,7 +9084,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -9108,13 +9104,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -9135,7 +9131,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -9188,6 +9184,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -9200,9 +9206,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -9212,8 +9218,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -9225,18 +9231,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -9245,24 +9332,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -9291,9 +9379,50 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -9307,9 +9436,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -9328,7 +9467,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -9346,7 +9488,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -9386,13 +9528,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -9404,7 +9547,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -9413,7 +9556,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -9429,7 +9572,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -9540,7 +9683,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -10043,7 +10186,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -10061,7 +10204,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -10100,7 +10243,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -10129,7 +10272,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -10142,32 +10285,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -10175,6 +10318,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default @@ -10192,9 +10370,9 @@ func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;; esac } # func_stripname_cnf @@ -10221,14 +10399,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -10252,14 +10430,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -10283,14 +10461,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -10298,8 +10476,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -10315,14 +10491,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -10336,11 +10512,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -10389,7 +10617,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -10428,7 +10656,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -10439,14 +10667,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -10455,15 +10683,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -10478,22 +10699,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -10516,13 +10737,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -10544,22 +10765,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -10582,13 +10803,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -10609,7 +10830,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10671,7 +10892,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -10687,7 +10908,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -10717,7 +10938,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -10735,17 +10956,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -10756,8 +10978,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -10773,6 +10995,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -10843,7 +11070,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -10851,10 +11078,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -10870,7 +11116,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -10879,9 +11125,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -10906,6 +11152,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -11003,7 +11255,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -11032,7 +11284,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -11064,7 +11316,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -11094,7 +11346,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -11126,7 +11378,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -11145,13 +11397,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -11271,8 +11523,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -11284,9 +11536,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -11329,9 +11581,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -11346,7 +11598,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -11354,7 +11606,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -11364,7 +11616,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -11386,24 +11638,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -11416,7 +11668,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -11435,7 +11687,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -11451,7 +11703,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -11461,7 +11713,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -11469,61 +11721,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -11534,42 +11814,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -11583,8 +11868,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -11602,8 +11887,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -11615,7 +11900,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -11630,9 +11915,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -11649,15 +11934,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -11673,7 +11958,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -11681,34 +11966,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -11727,13 +12035,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -11752,35 +12068,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -11815,7 +12138,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -11823,17 +12146,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -11868,7 +12191,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -11876,21 +12199,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -11899,7 +12234,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -11929,16 +12264,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -11947,18 +12283,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -11967,7 +12303,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -11986,24 +12322,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -12045,33 +12381,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -12079,25 +12415,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -12109,7 +12445,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -12128,14 +12464,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -12143,8 +12479,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -12155,7 +12491,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -12166,8 +12502,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -12177,8 +12513,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -12190,24 +12526,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -12222,7 +12568,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -12230,27 +12576,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -12261,33 +12599,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -12298,24 +12656,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -12325,11 +12683,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -12339,10 +12697,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -12391,43 +12749,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -12442,10 +12800,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -12453,7 +12811,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -12479,7 +12837,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -12694,14 +13052,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -12717,28 +13075,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -12752,7 +13117,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -12761,7 +13126,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -12778,14 +13143,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -12793,41 +13160,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -12837,18 +13254,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -12856,8 +13273,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -12869,7 +13286,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -12878,8 +13295,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -12895,17 +13312,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -12914,8 +13331,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -12942,7 +13359,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -12955,8 +13372,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -12969,7 +13386,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -12982,8 +13399,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -12996,8 +13413,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -13015,12 +13432,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -13045,26 +13463,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -13082,14 +13489,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -13097,8 +13505,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -13107,8 +13515,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -13121,8 +13529,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -13133,7 +13541,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -13141,8 +13549,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -13161,8 +13569,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -13171,13 +13579,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -13221,14 +13649,15 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -13245,12 +13674,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -13260,7 +13689,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -13269,58 +13698,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -13331,8 +13770,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -13342,11 +13781,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -13354,8 +13793,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -13376,24 +13815,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -13411,7 +13850,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -13419,8 +13858,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -13430,20 +13869,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -13540,15 +13994,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -13563,12 +14017,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -13578,7 +14032,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -13588,23 +14042,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -13642,10 +14096,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -13653,10 +14107,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -13695,11 +14157,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -13738,7 +14200,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -13777,7 +14239,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -13816,7 +14278,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -13837,21 +14299,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -13859,7 +14321,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -13906,9 +14368,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -13938,7 +14400,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -13958,14 +14420,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -14012,9 +14474,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -14044,7 +14506,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -14065,9 +14527,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -14111,7 +14573,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -14139,7 +14601,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -14147,13 +14609,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -14161,8 +14623,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -14172,7 +14638,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -14186,11 +14652,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -14369,7 +14835,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -14430,46 +14896,39 @@ CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + func_cc_basename $compiler +cc_basename=$func_cc_basename_result if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' else lt_prog_compiler_no_builtin_flag_CXX= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -14483,7 +14942,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -14494,7 +14953,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -14505,32 +14964,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -14566,22 +15025,22 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec_CXX= fi @@ -14618,18 +15077,30 @@ ld_shlibs_CXX=no ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -14639,6 +15110,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -14657,13 +15135,21 @@ hardcode_direct_absolute_CXX=yes hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' + file_list_spec_CXX='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct_CXX=no + hardcode_direct_absolute_CXX=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -14681,36 +15167,44 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec_CXX='${wl}-bexpall' + export_dynamic_flag_spec_CXX='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' + # The "-G" linker flag allows undefined symbols. + no_undefined_flag_CXX='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -14745,7 +15239,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -14753,18 +15247,18 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath__CXX+:} false; then : @@ -14799,7 +15293,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" + lt_cv_aix_libpath__CXX=/usr/lib:/lib fi fi @@ -14807,22 +15301,34 @@ aix_libpath=$lt_cv_aix_libpath__CXX fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag_CXX=' $wl-bernotok' + allow_undefined_flag_CXX=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec_CXX='$convenience' fi archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -14832,7 +15338,7 @@ allow_undefined_flag_CXX=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs_CXX=no fi @@ -14860,57 +15366,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' enable_shared_with_static_runtimes_CXX=yes # Don't use ranlib old_postinstall_cmds_CXX='chmod 644 $oldlib' postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + export_dynamic_flag_spec_CXX='$wl--export-all-symbols' allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi @@ -14924,27 +15431,27 @@ hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec_CXX='' fi link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + allow_undefined_flag_CXX=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + if test yes != "$lt_cv_apple_cc_single_mod"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -14953,6 +15460,34 @@ ;; + os2*) + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_minus_L_CXX=yes + allow_undefined_flag_CXX=unsupported + shrext_cmds=.dll + archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes_CXX=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -14987,18 +15522,15 @@ ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes ;; hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' hardcode_direct_CXX=yes hardcode_minus_L_CXX=yes # Not in the search PATH, # but as the default @@ -15010,7 +15542,7 @@ ld_shlibs_CXX=no ;; aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -15019,11 +15551,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -15033,15 +15565,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir' hardcode_libdir_separator_CXX=: case $host_cpu in hppa*64*|ia64*) ;; *) - export_dynamic_flag_spec_CXX='${wl}-E' + export_dynamic_flag_spec_CXX='$wl-E' ;; esac fi @@ -15067,13 +15599,13 @@ aCC*) case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -15084,20 +15616,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -15112,22 +15644,22 @@ interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -15136,22 +15668,22 @@ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -15159,8 +15691,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -15169,10 +15701,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -15186,59 +15718,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -15252,18 +15784,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -15271,10 +15803,10 @@ *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on @@ -15332,22 +15864,17 @@ ld_shlibs_CXX=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no hardcode_direct_absolute_CXX=yes archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='$wl-E' + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -15363,9 +15890,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' hardcode_libdir_separator_CXX=: # Archives containing C++ object files must be created using @@ -15383,17 +15910,17 @@ cxx*) case $host in osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; esac @@ -15408,21 +15935,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_separator_CXX=: # Commands to make compiler produce verbose output that lists @@ -15468,9 +15995,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no @@ -15478,7 +16005,7 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; @@ -15495,30 +16022,30 @@ ;; gcx*) # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + no_undefined_flag_CXX=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -15526,11 +16053,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -15539,52 +16066,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' + no_undefined_flag_CXX='$wl-z,text' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' + no_undefined_flag_CXX='$wl-z,text' + allow_undefined_flag_CXX='$wl-z,nodefs' archive_cmds_need_lc_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_flag_spec_CXX='$wl-R,$libdir' hardcode_libdir_separator_CXX=':' link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' + export_dynamic_flag_spec_CXX='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" + '"$old_archive_cmds_CXX" reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" + '"$reload_cmds_CXX" ;; *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -15616,10 +16143,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no + test no = "$ld_shlibs_CXX" && can_build_shared=no - GCC_CXX="$GXX" - LD_CXX="$LD" + GCC_CXX=$GXX + LD_CXX=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -15663,13 +16190,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -15685,16 +16212,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" + compiler_lib_search_path_CXX=$prev$p else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -15702,9 +16229,9 @@ esac else if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" + postdeps_CXX=$prev$p else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" + postdeps_CXX="${postdeps_CXX} $prev$p" fi fi prev= @@ -15719,15 +16246,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" + predep_objects_CXX=$p else predep_objects_CXX="$predep_objects_CXX $p" fi else if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" + postdep_objects_CXX=$p else postdep_objects_CXX="$postdep_objects_CXX $p" fi @@ -15757,51 +16284,6 @@ postdep_objects_CXX= postdeps_CXX= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac @@ -15810,7 +16292,7 @@ esac compiler_lib_search_dirs_CXX= if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi @@ -15849,17 +16331,18 @@ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' fi + lt_prog_compiler_pic_CXX='-fPIC' ;; amigaos*) @@ -15870,8 +16353,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -15886,6 +16369,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static_CXX='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -15935,7 +16423,7 @@ case $host_os in aix[4-9]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static_CXX='-Bstatic' else @@ -15975,14 +16463,14 @@ case $cc_basename in CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then lt_prog_compiler_pic_CXX='+Z' fi ;; aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + lt_prog_compiler_static_CXX='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -16011,7 +16499,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -16019,7 +16507,7 @@ lt_prog_compiler_pic_CXX='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' @@ -16164,7 +16652,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= ;; @@ -16196,7 +16684,7 @@ lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -16226,7 +16714,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -16252,7 +16740,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -16271,13 +16759,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : else lt_prog_compiler_static_CXX= @@ -16391,8 +16879,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -16404,9 +16892,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -16423,17 +16911,21 @@ case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" + export_symbols_cmds_CXX=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -16453,7 +16945,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no +test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -16470,7 +16962,7 @@ # Assume -lc should be added archive_cmds_need_lc_CXX=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds_CXX in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -16598,7 +17090,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -16615,14 +17107,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -16630,41 +17124,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -16674,18 +17218,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -16693,8 +17237,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -16706,7 +17250,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -16715,8 +17259,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -16732,16 +17276,16 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -16750,8 +17294,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -16778,7 +17322,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -16791,8 +17335,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -16805,7 +17349,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -16818,8 +17362,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -16831,8 +17375,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -16850,12 +17394,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -16880,26 +17425,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -16917,14 +17451,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -16932,8 +17467,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -16942,8 +17477,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -16956,8 +17491,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -16968,7 +17503,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -16976,8 +17511,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -16996,8 +17531,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -17006,13 +17541,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -17056,14 +17611,15 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17080,12 +17636,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -17095,7 +17651,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -17104,58 +17660,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -17166,8 +17732,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -17177,11 +17743,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -17189,8 +17755,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -17211,24 +17777,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -17246,7 +17812,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -17254,8 +17820,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -17265,20 +17831,32 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + @@ -17321,15 +17899,15 @@ hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then + test yes = "$hardcode_automatic_CXX"; then # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && + if test no != "$hardcode_direct_CXX" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" && + test no != "$hardcode_minus_L_CXX"; then # Linking always hardcodes the temporary library directory. hardcode_action_CXX=relink else @@ -17344,12 +17922,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then +if test relink = "$hardcode_action_CXX" || + test yes = "$inherit_rpath_CXX"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -17372,7 +17950,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -30945,7 +31523,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libdap $as_me 3.20.4, which was +This file was extended by libdap $as_me 3.20.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31011,7 +31589,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libdap config.status 3.20.4 +libdap config.status 3.20.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -31147,6 +31725,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -31196,10 +31775,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -31264,7 +31846,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -31369,9 +31952,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -31437,7 +32023,7 @@ compiler_lib_search_path_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -31464,7 +32050,8 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path \ reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ @@ -31478,7 +32065,7 @@ postlink_cmds_CXX; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -31487,19 +32074,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -32250,55 +32834,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags='CXX ' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -32318,6 +32900,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -32435,18 +33020,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -32537,8 +33131,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -32631,13 +33228,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -32703,13 +33300,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -32718,7 +33374,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -32728,165 +33384,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -32973,13 +33470,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct_CXX -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute_CXX diff -Nru libdap-3.20.4/configure.ac libdap-3.20.5/configure.ac --- libdap-3.20.4/configure.ac 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/configure.ac 2020-02-17 07:35:45.000000000 +0000 @@ -8,7 +8,7 @@ dnl m4_pattern_allow([^BISON_USE_NLS$]) dnl Update version here and below at LIB_CURRENT, ..., if needed. -AC_INIT(libdap, 3.20.4, opendap-tech@opendap.org) +AC_INIT(libdap, 3.20.5, opendap-tech@opendap.org) AC_DEFINE(DAP_PROTOCOL_VERSION, ["4.0"], [Highest DAP version implemented?]) AC_SUBST([DAP_PROTOCOL_VERSION]) diff -Nru libdap-3.20.4/d4_ce/d4_ce_parser.tab.cc libdap-3.20.5/d4_ce/d4_ce_parser.tab.cc --- libdap-3.20.4/d4_ce/d4_ce_parser.tab.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_ce/d4_ce_parser.tab.cc 2020-02-17 07:35:45.000000000 +0000 @@ -41,7 +41,7 @@ // Unqualified %code blocks. -#line 76 "d4_ce_parser.yy" // lalr1.cc:435 +#line 77 "d4_ce_parser.yy" // lalr1.cc:435 #include #include @@ -695,7 +695,7 @@ // User initialization code. -#line 68 "d4_ce_parser.yy" // lalr1.cc:788 +#line 69 "d4_ce_parser.yy" // lalr1.cc:791 { // Initialize the initial location. This is printed when the parser builds // its own error messages - when the parse fails as opposed to when the @@ -704,7 +704,7 @@ yyla.location.initialize (driver.expression()); } -#line 708 "d4_ce_parser.tab.cc" // lalr1.cc:788 +#line 708 "d4_ce_parser.tab.cc" // lalr1.cc:791 /* Initialize the stack. The initial state will be set in yynewstate, since the latter expects the semantical and the @@ -851,31 +851,31 @@ switch (yyn) { case 2: -#line 147 "d4_ce_parser.yy" // lalr1.cc:919 +#line 148 "d4_ce_parser.yy" // lalr1.cc:919 { driver.set_result(yystack_[0].value.as < bool > ()); } #line 857 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 3: -#line 148 "d4_ce_parser.yy" // lalr1.cc:919 +#line 149 "d4_ce_parser.yy" // lalr1.cc:919 { driver.set_result(yystack_[2].value.as < bool > () && yystack_[0].value.as < bool > ()); } #line 863 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 4: -#line 151 "d4_ce_parser.yy" // lalr1.cc:919 +#line 152 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = yystack_[0].value.as < bool > (); } #line 869 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 5: -#line 152 "d4_ce_parser.yy" // lalr1.cc:919 +#line 153 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = yystack_[2].value.as < bool > () && yystack_[0].value.as < bool > (); } #line 875 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 6: -#line 156 "d4_ce_parser.yy" // lalr1.cc:919 +#line 157 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = driver.slice_dimension(yystack_[2].value.as < std::string > (), yystack_[0].value.as < libdap::D4ConstraintEvaluator::index > ()); } @@ -883,31 +883,31 @@ break; case 7: -#line 161 "d4_ce_parser.yy" // lalr1.cc:919 +#line 162 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = yystack_[0].value.as < bool > (); } #line 889 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 8: -#line 162 "d4_ce_parser.yy" // lalr1.cc:919 +#line 163 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = yystack_[2].value.as < bool > () && yystack_[0].value.as < bool > (); } #line 895 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 9: -#line 172 "d4_ce_parser.yy" // lalr1.cc:919 +#line 173 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = yystack_[0].value.as < bool > (); driver.pop_basetype(); } #line 901 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 10: -#line 176 "d4_ce_parser.yy" // lalr1.cc:919 +#line 177 "d4_ce_parser.yy" // lalr1.cc:919 { driver.pop_basetype(); yylhs.value.as < bool > () = yystack_[2].value.as < bool > () && yystack_[0].value.as < bool > (); } #line 907 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 11: -#line 184 "d4_ce_parser.yy" // lalr1.cc:919 +#line 185 "d4_ce_parser.yy" // lalr1.cc:919 { BaseType *btp = 0; if (driver.top_basetype()) { @@ -930,7 +930,7 @@ break; case 12: -#line 204 "d4_ce_parser.yy" // lalr1.cc:919 +#line 205 "d4_ce_parser.yy" // lalr1.cc:919 { BaseType *btp = 0; if (driver.top_basetype()) { @@ -956,7 +956,7 @@ break; case 13: -#line 228 "d4_ce_parser.yy" // lalr1.cc:919 +#line 229 "d4_ce_parser.yy" // lalr1.cc:919 { BaseType *btp = 0; if (driver.top_basetype()) { @@ -991,7 +991,7 @@ break; case 14: -#line 259 "d4_ce_parser.yy" // lalr1.cc:919 +#line 260 "d4_ce_parser.yy" // lalr1.cc:919 { //driver.pop_basetype(); yylhs.value.as < bool > () = true; @@ -1000,7 +1000,7 @@ break; case 15: -#line 267 "d4_ce_parser.yy" // lalr1.cc:919 +#line 268 "d4_ce_parser.yy" // lalr1.cc:919 { BaseType *btp = 0; if (driver.top_basetype()) { @@ -1028,7 +1028,7 @@ break; case 16: -#line 291 "d4_ce_parser.yy" // lalr1.cc:919 +#line 292 "d4_ce_parser.yy" // lalr1.cc:919 { //driver.pop_basetype(); yylhs.value.as < bool > () = true; @@ -1037,7 +1037,7 @@ break; case 17: -#line 302 "d4_ce_parser.yy" // lalr1.cc:919 +#line 303 "d4_ce_parser.yy" // lalr1.cc:919 { driver.push_index(yystack_[0].value.as < libdap::D4ConstraintEvaluator::index > ()); yylhs.value.as < bool > () = true; @@ -1046,79 +1046,79 @@ break; case 18: -#line 306 "d4_ce_parser.yy" // lalr1.cc:919 +#line 307 "d4_ce_parser.yy" // lalr1.cc:919 { driver.push_index(yystack_[0].value.as < libdap::D4ConstraintEvaluator::index > ()); } #line 1052 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 19: -#line 306 "d4_ce_parser.yy" // lalr1.cc:919 +#line 307 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = yystack_[0].value.as < bool > (); } #line 1058 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 20: -#line 311 "d4_ce_parser.yy" // lalr1.cc:919 +#line 312 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < libdap::D4ConstraintEvaluator::index > () = driver.make_index(); } #line 1064 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 21: -#line 312 "d4_ce_parser.yy" // lalr1.cc:919 +#line 313 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[1].value.as < std::string > ()); } #line 1070 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 22: -#line 313 "d4_ce_parser.yy" // lalr1.cc:919 +#line 314 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[3].value.as < std::string > (), 1, yystack_[1].value.as < std::string > ()); } #line 1076 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 23: -#line 314 "d4_ce_parser.yy" // lalr1.cc:919 +#line 315 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[5].value.as < std::string > (), yystack_[3].value.as < std::string > (), yystack_[1].value.as < std::string > ()); } #line 1082 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 24: -#line 315 "d4_ce_parser.yy" // lalr1.cc:919 +#line 316 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[2].value.as < std::string > (), 1); } #line 1088 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 25: -#line 316 "d4_ce_parser.yy" // lalr1.cc:919 +#line 317 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[4].value.as < std::string > (), yystack_[2].value.as < std::string > ()); } #line 1094 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 26: -#line 319 "d4_ce_parser.yy" // lalr1.cc:919 +#line 320 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = yystack_[1].value.as < bool > (); } #line 1100 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 27: -#line 325 "d4_ce_parser.yy" // lalr1.cc:919 +#line 326 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = true; } #line 1106 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 28: -#line 326 "d4_ce_parser.yy" // lalr1.cc:919 +#line 327 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < bool > () = yystack_[2].value.as < bool > () && yystack_[0].value.as < bool > (); } #line 1112 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 29: -#line 338 "d4_ce_parser.yy" // lalr1.cc:919 +#line 339 "d4_ce_parser.yy" // lalr1.cc:919 { driver.add_filter_clause(yystack_[1].value.as < std::string > (), yystack_[2].value.as < std::string > (), yystack_[0].value.as < std::string > ()); yylhs.value.as < bool > () = true; } #line 1118 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 30: -#line 341 "d4_ce_parser.yy" // lalr1.cc:919 +#line 342 "d4_ce_parser.yy" // lalr1.cc:919 { driver.add_filter_clause(yystack_[3].value.as < std::string > (), yystack_[4].value.as < std::string > (), yystack_[2].value.as < std::string > ()); driver.add_filter_clause(yystack_[1].value.as < std::string > (), yystack_[2].value.as < std::string > (), yystack_[0].value.as < std::string > ()); @@ -1129,73 +1129,73 @@ break; case 31: -#line 347 "d4_ce_parser.yy" // lalr1.cc:919 +#line 348 "d4_ce_parser.yy" // lalr1.cc:919 { throw Error(malformed_expr, "The 'ND' operator is not currently supported."); } #line 1135 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 32: -#line 355 "d4_ce_parser.yy" // lalr1.cc:919 +#line 356 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = "<";} #line 1141 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 33: -#line 356 "d4_ce_parser.yy" // lalr1.cc:919 +#line 357 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = ">";} #line 1147 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 34: -#line 357 "d4_ce_parser.yy" // lalr1.cc:919 +#line 358 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = "<=";} #line 1153 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 35: -#line 358 "d4_ce_parser.yy" // lalr1.cc:919 +#line 359 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = ">=";} #line 1159 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 36: -#line 359 "d4_ce_parser.yy" // lalr1.cc:919 +#line 360 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = "==";} #line 1165 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 37: -#line 360 "d4_ce_parser.yy" // lalr1.cc:919 +#line 361 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = "!=";} #line 1171 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 38: -#line 361 "d4_ce_parser.yy" // lalr1.cc:919 +#line 362 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = "~=";} #line 1177 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 39: -#line 363 "d4_ce_parser.yy" // lalr1.cc:919 +#line 364 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = "<<";} #line 1183 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 40: -#line 364 "d4_ce_parser.yy" // lalr1.cc:919 +#line 365 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = ">>";} #line 1189 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 41: -#line 366 "d4_ce_parser.yy" // lalr1.cc:919 +#line 367 "d4_ce_parser.yy" // lalr1.cc:919 {yylhs.value.as < std::string > () = "@=";} #line 1195 "d4_ce_parser.tab.cc" // lalr1.cc:919 break; case 42: -#line 370 "d4_ce_parser.yy" // lalr1.cc:919 +#line 371 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > () = yystack_[0].value.as < std::string > (); } @@ -1203,7 +1203,7 @@ break; case 43: -#line 374 "d4_ce_parser.yy" // lalr1.cc:919 +#line 375 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > ().append("/"); yylhs.value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); @@ -1212,7 +1212,7 @@ break; case 44: -#line 379 "d4_ce_parser.yy" // lalr1.cc:919 +#line 380 "d4_ce_parser.yy" // lalr1.cc:919 { yystack_[2].value.as < std::string > ().append("/"); yystack_[2].value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); @@ -1222,7 +1222,7 @@ break; case 45: -#line 387 "d4_ce_parser.yy" // lalr1.cc:919 +#line 388 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > ().append("/"); yylhs.value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); @@ -1231,7 +1231,7 @@ break; case 46: -#line 392 "d4_ce_parser.yy" // lalr1.cc:919 +#line 393 "d4_ce_parser.yy" // lalr1.cc:919 { yystack_[2].value.as < std::string > ().append("/"); yystack_[2].value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); @@ -1241,7 +1241,7 @@ break; case 47: -#line 400 "d4_ce_parser.yy" // lalr1.cc:919 +#line 401 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > () = yystack_[0].value.as < std::string > (); } @@ -1249,7 +1249,7 @@ break; case 48: -#line 404 "d4_ce_parser.yy" // lalr1.cc:919 +#line 405 "d4_ce_parser.yy" // lalr1.cc:919 { yystack_[2].value.as < std::string > ().append("."); yystack_[2].value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); @@ -1259,7 +1259,7 @@ break; case 49: -#line 421 "d4_ce_parser.yy" // lalr1.cc:919 +#line 422 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > ()=www2id(yystack_[0].value.as < std::string > ()); } @@ -1267,7 +1267,7 @@ break; case 50: -#line 425 "d4_ce_parser.yy" // lalr1.cc:919 +#line 426 "d4_ce_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > ()=driver.remove_quotes(yystack_[0].value.as < std::string > ()); } @@ -1670,12 +1670,12 @@ const unsigned short D4CEParser::yyrline_[] = { - 0, 147, 147, 148, 151, 152, 155, 161, 162, 172, - 176, 183, 203, 228, 227, 267, 266, 301, 306, 306, - 311, 312, 313, 314, 315, 316, 319, 325, 326, 337, - 340, 347, 355, 356, 357, 358, 359, 360, 361, 363, - 364, 366, 369, 373, 378, 386, 391, 399, 403, 420, - 424 + 0, 148, 148, 149, 152, 153, 156, 162, 163, 173, + 177, 184, 204, 229, 228, 268, 267, 302, 307, 307, + 312, 313, 314, 315, 316, 317, 320, 326, 327, 338, + 341, 348, 356, 357, 358, 359, 360, 361, 362, 364, + 365, 367, 370, 374, 379, 387, 392, 400, 404, 421, + 425 }; // Print the state stack on the debug stream. @@ -1760,7 +1760,7 @@ #line 35 "d4_ce_parser.yy" // lalr1.cc:1242 } // libdap #line 1763 "d4_ce_parser.tab.cc" // lalr1.cc:1242 -#line 430 "d4_ce_parser.yy" // lalr1.cc:1243 +#line 431 "d4_ce_parser.yy" // lalr1.cc:1243 // Forward the error to the driver for handling. The location parameter diff -Nru libdap-3.20.4/d4_ce/d4_ce_parser.tab.hh libdap-3.20.5/d4_ce/d4_ce_parser.tab.hh --- libdap-3.20.4/d4_ce/d4_ce_parser.tab.hh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_ce/d4_ce_parser.tab.hh 2020-02-17 07:35:45.000000000 +0000 @@ -44,8 +44,9 @@ #ifndef YY_YY_D4_CE_PARSER_TAB_HH_INCLUDED # define YY_YY_D4_CE_PARSER_TAB_HH_INCLUDED // // "%code requires" blocks. -#line 48 "d4_ce_parser.yy" // lalr1.cc:401 +#line 48 "d4_ce_parser.yy" // lalr1.cc:417 +#define YYERROR_VERBOSE 0 #include "D4ConstraintEvaluator.h" #include "escaping.h" // for www2id() used with WORD and STRING namespace libdap { @@ -53,7 +54,7 @@ } -#line 57 "d4_ce_parser.tab.hh" // lalr1.cc:401 +#line 58 "d4_ce_parser.tab.hh" // lalr1.cc:417 # include # include // std::abort @@ -167,9 +168,9 @@ # define YYDEBUG 1 #endif -#line 35 "d4_ce_parser.yy" // lalr1.cc:401 +#line 35 "d4_ce_parser.yy" // lalr1.cc:417 namespace libdap { -#line 173 "d4_ce_parser.tab.hh" // lalr1.cc:401 +#line 174 "d4_ce_parser.tab.hh" // lalr1.cc:417 @@ -1441,9 +1442,9 @@ }; -#line 35 "d4_ce_parser.yy" // lalr1.cc:401 +#line 35 "d4_ce_parser.yy" // lalr1.cc:417 } // libdap -#line 1447 "d4_ce_parser.tab.hh" // lalr1.cc:401 +#line 1448 "d4_ce_parser.tab.hh" // lalr1.cc:417 diff -Nru libdap-3.20.4/d4_ce/d4_ce_parser.yy libdap-3.20.5/d4_ce/d4_ce_parser.yy --- libdap-3.20.4/d4_ce/d4_ce_parser.yy 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_ce/d4_ce_parser.yy 2020-02-17 07:35:45.000000000 +0000 @@ -46,6 +46,7 @@ // %define api.prefix { d4_ce } %code requires { +#define YYERROR_VERBOSE 0 #include "D4ConstraintEvaluator.h" #include "escaping.h" // for www2id() used with WORD and STRING namespace libdap { diff -Nru libdap-3.20.4/d4_ce/d4_ce_scanner.ll libdap-3.20.5/d4_ce/d4_ce_scanner.ll --- libdap-3.20.4/d4_ce/d4_ce_scanner.ll 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_ce/d4_ce_scanner.ll 2020-02-17 07:35:45.000000000 +0000 @@ -44,6 +44,8 @@ /* define yyterminate as this instead of NULL */ #define yyterminate() return(token::END) +#define YYERROR_VERBOSE 0 + #define YY_FATAL_ERROR(msg) {\ throw(libdap::Error(malformed_expr, std::string("Error scanning constraint expression text: ") + std::string(msg))); \ } diff -Nru libdap-3.20.4/d4_ce/location.hh libdap-3.20.5/d4_ce/location.hh --- libdap-3.20.4/d4_ce/location.hh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_ce/location.hh 2020-02-17 07:35:45.000000000 +0000 @@ -54,9 +54,9 @@ # endif # endif -#line 35 "d4_ce_parser.yy" // location.cc:339 +#line 35 "d4_ce_parser.yy" // location.cc:360 namespace libdap { -#line 60 "location.hh" // location.cc:339 +#line 60 "location.hh" // location.cc:360 /// A point in a source file. class position { @@ -316,7 +316,7 @@ return ostr; } -#line 35 "d4_ce_parser.yy" // location.cc:339 +#line 35 "d4_ce_parser.yy" // location.cc:360 } // libdap -#line 322 "location.hh" // location.cc:339 +#line 322 "location.hh" // location.cc:360 #endif // !YY_YY_LOCATION_HH_INCLUDED diff -Nru libdap-3.20.4/d4_ce/Makefile.in libdap-3.20.5/d4_ce/Makefile.in --- libdap-3.20.4/d4_ce/Makefile.in 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_ce/Makefile.in 2020-02-17 07:35:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -707,6 +707,7 @@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ diff -Nru libdap-3.20.4/d4_function/d4_function_parser.tab.cc libdap-3.20.5/d4_function/d4_function_parser.tab.cc --- libdap-3.20.4/d4_function/d4_function_parser.tab.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_function/d4_function_parser.tab.cc 2020-02-17 07:35:45.000000000 +0000 @@ -41,7 +41,7 @@ // Unqualified %code blocks. -#line 77 "d4_function_parser.yy" // lalr1.cc:435 +#line 79 "d4_function_parser.yy" // lalr1.cc:435 #include "BaseType.h" #include "DMR.h" @@ -1031,7 +1031,7 @@ // User initialization code. -#line 69 "d4_function_parser.yy" // lalr1.cc:788 +#line 71 "d4_function_parser.yy" // lalr1.cc:791 { // Initialize the initial location. This is printed when the parser builds // its own error messages - when the parse fails as opposed to when the @@ -1040,7 +1040,7 @@ yyla.location.initialize (evaluator.expression()); } -#line 1044 "d4_function_parser.tab.cc" // lalr1.cc:788 +#line 1044 "d4_function_parser.tab.cc" // lalr1.cc:791 /* Initialize the stack. The initial state will be set in yynewstate, since the latter expects the semantical and the @@ -1243,7 +1243,7 @@ switch (yyn) { case 2: -#line 156 "d4_function_parser.yy" // lalr1.cc:919 +#line 158 "d4_function_parser.yy" // lalr1.cc:919 { evaluator.set_result(yystack_[0].value.as < D4RValueList* > ()); } @@ -1251,7 +1251,7 @@ break; case 3: -#line 162 "d4_function_parser.yy" // lalr1.cc:919 +#line 164 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < D4RValueList* > () = new D4RValueList(yystack_[0].value.as < D4RValue* > ()); } @@ -1259,7 +1259,7 @@ break; case 4: -#line 166 "d4_function_parser.yy" // lalr1.cc:919 +#line 168 "d4_function_parser.yy" // lalr1.cc:919 { yystack_[2].value.as < D4RValueList* > ()->add_rvalue(yystack_[0].value.as < D4RValue* > ()); yylhs.value.as < D4RValueList* > () = yystack_[2].value.as < D4RValueList* > (); @@ -1268,7 +1268,7 @@ break; case 5: -#line 173 "d4_function_parser.yy" // lalr1.cc:919 +#line 175 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < D4RValue* > () = new D4RValue(yystack_[3].value.as < D4Function > (), yystack_[1].value.as < D4RValueList* > ()); // Build a D4RValue from a D4Function pointer and a D4RValueList } @@ -1276,7 +1276,7 @@ break; case 6: -#line 179 "d4_function_parser.yy" // lalr1.cc:919 +#line 181 "d4_function_parser.yy" // lalr1.cc:919 { D4Function f; if (!evaluator.sf_list()->find_function(yystack_[0].value.as < std::string > (), &f)) { @@ -1290,7 +1290,7 @@ break; case 7: -#line 191 "d4_function_parser.yy" // lalr1.cc:919 +#line 193 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < D4RValueList* > () = new D4RValueList(yystack_[0].value.as < D4RValue* > ()); // build a D4RValueList from the D4RValue } @@ -1298,7 +1298,7 @@ break; case 8: -#line 195 "d4_function_parser.yy" // lalr1.cc:919 +#line 197 "d4_function_parser.yy" // lalr1.cc:919 { yystack_[2].value.as < D4RValueList* > ()->add_rvalue(yystack_[0].value.as < D4RValue* > ()); yylhs.value.as < D4RValueList* > () = yystack_[2].value.as < D4RValueList* > (); // Append the D4RValue ($3) to the D4RValueList ($1), then return @@ -1307,7 +1307,7 @@ break; case 9: -#line 202 "d4_function_parser.yy" // lalr1.cc:919 +#line 204 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < D4RValue* > () = yystack_[0].value.as < D4RValue* > (); } @@ -1315,7 +1315,7 @@ break; case 10: -#line 206 "d4_function_parser.yy" // lalr1.cc:919 +#line 208 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < D4RValue* > () = yystack_[0].value.as < D4RValue* > (); } @@ -1323,7 +1323,7 @@ break; case 11: -#line 210 "d4_function_parser.yy" // lalr1.cc:919 +#line 212 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < D4RValue* > () = yystack_[0].value.as < D4RValue* > (); } @@ -1333,6 +1333,14 @@ case 12: #line 216 "d4_function_parser.yy" // lalr1.cc:919 { + yylhs.value.as < D4RValue* > () = 0; +} +#line 1339 "d4_function_parser.tab.cc" // lalr1.cc:919 + break; + + case 13: +#line 222 "d4_function_parser.yy" // lalr1.cc:919 + { D4RValue *rvalue = evaluator.build_rvalue(yystack_[0].value.as < std::string > ()); if (!rvalue) { throw Error(malformed_expr, "'" + yystack_[0].value.as < std::string > () + "' is not a variable, number or string."); @@ -1340,16 +1348,7 @@ yylhs.value.as < D4RValue* > () = rvalue; } -#line 1344 "d4_function_parser.tab.cc" // lalr1.cc:919 - break; - - case 13: -#line 228 "d4_function_parser.yy" // lalr1.cc:919 - { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); -} -#line 1353 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1352 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 14: @@ -1358,94 +1357,95 @@ yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); delete yystack_[1].value.as < std::vector* > (); } -#line 1362 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1361 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 15: #line 240 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1371 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1370 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 16: #line 246 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1380 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1379 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 17: #line 252 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1389 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1388 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 18: #line 258 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1398 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1397 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 19: #line 264 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1407 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1406 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 20: #line 270 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1416 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1415 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 21: #line 276 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1425 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1424 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 22: #line 282 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1434 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1433 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 23: #line 288 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); - delete yystack_[1].value.as < std::vector* > (); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } -#line 1443 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1442 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 24: -#line 300 "d4_function_parser.yy" // lalr1.cc:919 +#line 294 "d4_function_parser.yy" // lalr1.cc:919 { - evaluator.set_arg_length_hint(get_uint64(yystack_[0].value.as < std::string > ().c_str())); + yylhs.value.as < D4RValue* > () = new D4RValue(*(yystack_[1].value.as < std::vector* > ())); + delete yystack_[1].value.as < std::vector* > (); } #line 1451 "d4_function_parser.tab.cc" // lalr1.cc:919 break; @@ -1453,255 +1453,263 @@ case 25: #line 306 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_byte(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); + evaluator.set_arg_length_hint(get_uint64(yystack_[0].value.as < std::string > ().c_str())); } #line 1459 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 26: -#line 310 "d4_function_parser.yy" // lalr1.cc:919 +#line 312 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_byte(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); } -#line 1468 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1467 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 27: -#line 317 "d4_function_parser.yy" // lalr1.cc:919 +#line 316 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_int8(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1476 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 28: -#line 321 "d4_function_parser.yy" // lalr1.cc:919 +#line 323 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_int8(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); } -#line 1485 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1484 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 29: -#line 328 "d4_function_parser.yy" // lalr1.cc:919 +#line 327 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_uint16(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1493 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 30: -#line 332 "d4_function_parser.yy" // lalr1.cc:919 +#line 334 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_uint16(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); } -#line 1502 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1501 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 31: -#line 339 "d4_function_parser.yy" // lalr1.cc:919 +#line 338 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_int16(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1510 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 32: -#line 343 "d4_function_parser.yy" // lalr1.cc:919 +#line 345 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_int16(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); } -#line 1519 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1518 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 33: -#line 350 "d4_function_parser.yy" // lalr1.cc:919 +#line 349 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_uint32(strtoul(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1527 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 34: -#line 354 "d4_function_parser.yy" // lalr1.cc:919 +#line 356 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtoul(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_uint32(strtoul(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); } -#line 1536 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1535 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 35: #line 360 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_int32(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtoul(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1544 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 36: -#line 364 "d4_function_parser.yy" // lalr1.cc:919 +#line 366 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_int32(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); } -#line 1553 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1552 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 37: -#line 371 "d4_function_parser.yy" // lalr1.cc:919 +#line 370 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_uint64(strtoull(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtol(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1561 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 38: -#line 375 "d4_function_parser.yy" // lalr1.cc:919 +#line 377 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtoull(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_uint64(strtoull(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); } -#line 1570 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1569 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 39: -#line 382 "d4_function_parser.yy" // lalr1.cc:919 +#line 381 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_int64(strtoll(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtoull(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1578 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 40: -#line 386 "d4_function_parser.yy" // lalr1.cc:919 +#line 388 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtoll(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_int64(strtoll(yystack_[0].value.as < std::string > ().c_str(), 0, 0))); } -#line 1587 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1586 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 41: -#line 396 "d4_function_parser.yy" // lalr1.cc:919 +#line 392 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_float32(strtof(yystack_[0].value.as < std::string > ().c_str(), 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtoll(yystack_[0].value.as < std::string > ().c_str(), 0, 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1595 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 42: -#line 400 "d4_function_parser.yy" // lalr1.cc:919 +#line 402 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtof(yystack_[0].value.as < std::string > ().c_str(), 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_float32(strtof(yystack_[0].value.as < std::string > ().c_str(), 0))); } -#line 1604 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1603 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 43: -#line 407 "d4_function_parser.yy" // lalr1.cc:919 +#line 406 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_float64(strtod(yystack_[0].value.as < std::string > ().c_str(), 0))); + yystack_[2].value.as < std::vector* > ()->push_back(strtof(yystack_[0].value.as < std::string > ().c_str(), 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1612 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 44: -#line 411 "d4_function_parser.yy" // lalr1.cc:919 +#line 413 "d4_function_parser.yy" // lalr1.cc:919 { - yystack_[2].value.as < std::vector* > ()->push_back(strtod(yystack_[0].value.as < std::string > ().c_str(), 0)); - yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); + yylhs.value.as < std::vector* > () = evaluator.init_arg_list(dods_float64(strtod(yystack_[0].value.as < std::string > ().c_str(), 0))); } -#line 1621 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1620 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 45: -#line 418 "d4_function_parser.yy" // lalr1.cc:919 +#line 417 "d4_function_parser.yy" // lalr1.cc:919 { - yylhs.value.as < std::string > () = yystack_[0].value.as < std::string > (); + yystack_[2].value.as < std::vector* > ()->push_back(strtod(yystack_[0].value.as < std::string > ().c_str(), 0)); + yylhs.value.as < std::vector* > () = yystack_[2].value.as < std::vector* > (); } #line 1629 "d4_function_parser.tab.cc" // lalr1.cc:919 break; case 46: -#line 422 "d4_function_parser.yy" // lalr1.cc:919 +#line 424 "d4_function_parser.yy" // lalr1.cc:919 + { + yylhs.value.as < std::string > () = yystack_[0].value.as < std::string > (); +} +#line 1637 "d4_function_parser.tab.cc" // lalr1.cc:919 + break; + + case 47: +#line 428 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > ().append("/"); yylhs.value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); } -#line 1638 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1646 "d4_function_parser.tab.cc" // lalr1.cc:919 break; - case 47: -#line 427 "d4_function_parser.yy" // lalr1.cc:919 + case 48: +#line 433 "d4_function_parser.yy" // lalr1.cc:919 { yystack_[2].value.as < std::string > ().append("/"); yystack_[2].value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); yylhs.value.as < std::string > () = yystack_[2].value.as < std::string > (); } -#line 1648 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1656 "d4_function_parser.tab.cc" // lalr1.cc:919 break; - case 48: -#line 435 "d4_function_parser.yy" // lalr1.cc:919 + case 49: +#line 441 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > ().append("/"); yylhs.value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); } -#line 1657 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1665 "d4_function_parser.tab.cc" // lalr1.cc:919 break; - case 49: -#line 440 "d4_function_parser.yy" // lalr1.cc:919 + case 50: +#line 446 "d4_function_parser.yy" // lalr1.cc:919 { yystack_[2].value.as < std::string > ().append("."); yystack_[2].value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); yylhs.value.as < std::string > () = yystack_[2].value.as < std::string > (); } -#line 1667 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1675 "d4_function_parser.tab.cc" // lalr1.cc:919 break; - case 50: -#line 448 "d4_function_parser.yy" // lalr1.cc:919 + case 51: +#line 454 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > () = yystack_[0].value.as < std::string > (); } -#line 1675 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1683 "d4_function_parser.tab.cc" // lalr1.cc:919 break; - case 51: -#line 452 "d4_function_parser.yy" // lalr1.cc:919 + case 52: +#line 458 "d4_function_parser.yy" // lalr1.cc:919 { yystack_[2].value.as < std::string > ().append("."); yystack_[2].value.as < std::string > ().append(yystack_[0].value.as < std::string > ()); yylhs.value.as < std::string > () = yystack_[2].value.as < std::string > (); } -#line 1685 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1693 "d4_function_parser.tab.cc" // lalr1.cc:919 break; - case 52: -#line 463 "d4_function_parser.yy" // lalr1.cc:919 + case 53: +#line 469 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > ()=yystack_[0].value.as < std::string > (); } -#line 1693 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1701 "d4_function_parser.tab.cc" // lalr1.cc:919 break; - case 53: -#line 467 "d4_function_parser.yy" // lalr1.cc:919 + case 54: +#line 473 "d4_function_parser.yy" // lalr1.cc:919 { yylhs.value.as < std::string > ()=yystack_[0].value.as < std::string > (); } -#line 1701 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1709 "d4_function_parser.tab.cc" // lalr1.cc:919 break; -#line 1705 "d4_function_parser.tab.cc" // lalr1.cc:919 +#line 1713 "d4_function_parser.tab.cc" // lalr1.cc:919 default: break; } @@ -1973,7 +1981,7 @@ const signed char D4FunctionParser::yypact_ninf_ = -20; - const signed char D4FunctionParser::yytable_ninf_ = -50; + const signed char D4FunctionParser::yytable_ninf_ = -51; const signed char D4FunctionParser::yypact_[] = @@ -1996,19 +2004,19 @@ const unsigned char D4FunctionParser::yydefact_[] = { - 0, 6, 0, 2, 3, 0, 1, 0, 0, 4, - 52, 53, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 9, 0, 7, 10, 11, 12, - 0, 45, 50, 52, 46, 50, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, - 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 8, 47, 50, 51, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, - 0, 27, 0, 29, 0, 31, 0, 33, 0, 35, - 0, 37, 0, 39, 0, 0, 41, 0, 43, 13, - 0, 14, 15, 0, 16, 0, 17, 0, 18, 0, - 19, 0, 20, 0, 21, 0, 22, 0, 23, 0, - 26, 28, 30, 32, 34, 36, 38, 40, 42, 44 + 0, 6, 0, 2, 3, 0, 1, 0, 12, 4, + 53, 54, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 9, 0, 7, 10, 11, 13, + 0, 46, 51, 53, 47, 51, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 12, 0, + 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 8, 48, 51, 52, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, + 0, 28, 0, 30, 0, 32, 0, 34, 0, 36, + 0, 38, 0, 40, 0, 0, 42, 0, 44, 14, + 0, 15, 16, 0, 17, 0, 18, 0, 19, 0, + 20, 0, 21, 0, 22, 0, 23, 0, 24, 0, + 27, 29, 31, 33, 35, 37, 39, 41, 43, 45 }; const signed char @@ -2038,8 +2046,8 @@ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, -6, 36, 37, 96, 98, 38, 39, 40, 41, 42, 43, 44, 45, 46, 51, 67, 78, 49, 68, - 50, -48, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 81, 83, 85, 87, -49, 89, 91, 93, 120, + 50, -49, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 81, 83, 85, 87, -50, 89, 91, 93, 120, 121, 122, 123, 124, 125, 128, 126, 129, 127, 80, 0, 0, 0, 0, 0, 0, 0, 63 }; @@ -2083,22 +2091,22 @@ D4FunctionParser::yyr1_[] = { 0, 40, 41, 42, 42, 43, 44, 45, 45, 46, - 46, 46, 47, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 49, 50, 50, 51, 51, 52, - 52, 53, 53, 54, 54, 55, 55, 56, 56, 57, - 57, 58, 58, 59, 59, 60, 60, 60, 61, 61, - 62, 62, 63, 63 + 46, 46, 46, 47, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 49, 50, 50, 51, 51, + 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, + 57, 57, 58, 58, 59, 59, 60, 60, 60, 61, + 61, 62, 62, 63, 63 }; const unsigned char D4FunctionParser::yyr2_[] = { 0, 2, 1, 1, 3, 4, 1, 1, 3, 1, - 1, 1, 1, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 1, 1, 3, 1, 3, 1, - 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, - 3, 1, 3, 1, 3, 1, 2, 3, 2, 3, - 1, 3, 1, 1 + 1, 1, 0, 1, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 1, 1, 3, 1, 3, + 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, + 1, 3, 1, 3, 1, 3, 1, 2, 3, 2, + 3, 1, 3, 1, 1 }; @@ -2132,12 +2140,12 @@ const unsigned short D4FunctionParser::yyrline_[] = { - 0, 155, 155, 161, 165, 172, 178, 190, 194, 201, - 205, 209, 215, 227, 233, 239, 245, 251, 257, 263, - 269, 275, 281, 287, 299, 305, 309, 316, 320, 327, - 331, 338, 342, 349, 353, 359, 363, 370, 374, 381, - 385, 395, 399, 406, 410, 417, 421, 426, 434, 439, - 447, 451, 462, 466 + 0, 157, 157, 163, 167, 174, 180, 192, 196, 203, + 207, 211, 216, 221, 233, 239, 245, 251, 257, 263, + 269, 275, 281, 287, 293, 305, 311, 315, 322, 326, + 333, 337, 344, 348, 355, 359, 365, 369, 376, 380, + 387, 391, 401, 405, 412, 416, 423, 427, 432, 440, + 445, 453, 457, 468, 472 }; // Print the state stack on the debug stream. @@ -2222,8 +2230,8 @@ #line 34 "d4_function_parser.yy" // lalr1.cc:1242 } // libdap -#line 2226 "d4_function_parser.tab.cc" // lalr1.cc:1242 -#line 472 "d4_function_parser.yy" // lalr1.cc:1243 +#line 2234 "d4_function_parser.tab.cc" // lalr1.cc:1242 +#line 478 "d4_function_parser.yy" // lalr1.cc:1243 // Forward the error to the driver for handling. The location parameter diff -Nru libdap-3.20.4/d4_function/d4_function_parser.tab.hh libdap-3.20.5/d4_function/d4_function_parser.tab.hh --- libdap-3.20.4/d4_function/d4_function_parser.tab.hh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_function/d4_function_parser.tab.hh 2020-02-17 07:35:45.000000000 +0000 @@ -44,9 +44,11 @@ #ifndef YY_YY_D4_FUNCTION_PARSER_TAB_HH_INCLUDED # define YY_YY_D4_FUNCTION_PARSER_TAB_HH_INCLUDED // // "%code requires" blocks. -#line 47 "d4_function_parser.yy" // lalr1.cc:401 +#line 47 "d4_function_parser.yy" // lalr1.cc:417 +#define YYERROR_VERBOSE 0 + #include "D4FunctionEvaluator.h" #include "D4RValue.h" #include "dods-datatypes.h" @@ -56,7 +58,7 @@ } -#line 60 "d4_function_parser.tab.hh" // lalr1.cc:401 +#line 62 "d4_function_parser.tab.hh" // lalr1.cc:417 # include # include // std::abort @@ -170,9 +172,9 @@ # define YYDEBUG 1 #endif -#line 34 "d4_function_parser.yy" // lalr1.cc:401 +#line 34 "d4_function_parser.yy" // lalr1.cc:417 namespace libdap { -#line 176 "d4_function_parser.tab.hh" // lalr1.cc:401 +#line 178 "d4_function_parser.tab.hh" // lalr1.cc:417 @@ -1793,9 +1795,9 @@ }; -#line 34 "d4_function_parser.yy" // lalr1.cc:401 +#line 34 "d4_function_parser.yy" // lalr1.cc:417 } // libdap -#line 1799 "d4_function_parser.tab.hh" // lalr1.cc:401 +#line 1801 "d4_function_parser.tab.hh" // lalr1.cc:417 diff -Nru libdap-3.20.4/d4_function/d4_function_parser.yy libdap-3.20.5/d4_function/d4_function_parser.yy --- libdap-3.20.4/d4_function/d4_function_parser.yy 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_function/d4_function_parser.yy 2020-02-17 07:35:45.000000000 +0000 @@ -46,6 +46,8 @@ %code requires { +#define YYERROR_VERBOSE 0 + #include "D4FunctionEvaluator.h" #include "D4RValue.h" #include "dods-datatypes.h" @@ -210,6 +212,10 @@ { $$ = $1; } +| /* Null, argument lists may be empty */ +{ + $$ = 0; +} ; variable_or_constant : id diff -Nru libdap-3.20.4/d4_function/location.hh libdap-3.20.5/d4_function/location.hh --- libdap-3.20.4/d4_function/location.hh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_function/location.hh 2020-02-17 07:35:45.000000000 +0000 @@ -54,9 +54,9 @@ # endif # endif -#line 34 "d4_function_parser.yy" // location.cc:339 +#line 34 "d4_function_parser.yy" // location.cc:360 namespace libdap { -#line 60 "location.hh" // location.cc:339 +#line 60 "location.hh" // location.cc:360 /// A point in a source file. class position { @@ -316,7 +316,7 @@ return ostr; } -#line 34 "d4_function_parser.yy" // location.cc:339 +#line 34 "d4_function_parser.yy" // location.cc:360 } // libdap -#line 322 "location.hh" // location.cc:339 +#line 322 "location.hh" // location.cc:360 #endif // !YY_YY_LOCATION_HH_INCLUDED diff -Nru libdap-3.20.4/d4_function/Makefile.in libdap-3.20.5/d4_function/Makefile.in --- libdap-3.20.4/d4_function/Makefile.in 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/d4_function/Makefile.in 2020-02-17 07:35:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -704,6 +704,7 @@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ diff -Nru libdap-3.20.4/D4Group.cc libdap-3.20.5/D4Group.cc --- libdap-3.20.4/D4Group.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/D4Group.cc 2020-02-17 07:35:45.000000000 +0000 @@ -710,6 +710,7 @@ for (vector::iterator vi = new_vars->begin(), ve = new_vars->end(); vi != ve; vi++) { string new_name = (is_root ? "" : FQN()) + (*vi)->name(); (*vi)->set_name(new_name); + (*vi)->set_parent(NULL); results->push_back((*vi)); #if 0 (*vi) = NULL; diff -Nru libdap-3.20.4/das.tab.cc libdap-3.20.5/das.tab.cc --- libdap-3.20.4/das.tab.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/das.tab.cc 2020-02-17 07:35:45.000000000 +0000 @@ -111,6 +111,7 @@ #define YYSTYPE char * #define ATTR_STRING_QUOTE_FIX +#define YYERROR_VERBOSE 0 #include "config.h" @@ -151,7 +152,7 @@ extern int das_line_num; /* defined in das.lex */ -#line 155 "das.tab.cc" /* yacc.c:352 */ +#line 156 "das.tab.cc" /* yacc.c:352 */ /* Token type. */ #ifndef YYTOKENTYPE @@ -190,7 +191,7 @@ /* Unqualified %code blocks. */ -#line 85 "das.yy" /* yacc.c:355 */ +#line 86 "das.yy" /* yacc.c:355 */ // No global static objects. We go through this every so often, I guess I // should learn... 1/24/2000 jhrg @@ -230,7 +231,7 @@ const string &msg); -#line 234 "das.tab.cc" /* yacc.c:355 */ +#line 235 "das.tab.cc" /* yacc.c:355 */ #ifdef short # undef short @@ -520,15 +521,15 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 194, 194, 194, 211, 212, 216, 217, 223, 224, - 225, 228, 230, 231, 230, 234, 235, 234, 238, 239, - 238, 242, 243, 242, 246, 247, 246, 250, 251, 250, - 254, 255, 254, 258, 259, 258, 262, 263, 262, 266, - 267, 266, 271, 291, 270, 299, 298, 304, 308, 314, - 318, 324, 328, 334, 338, 344, 348, 354, 358, 364, - 368, 374, 379, 386, 390, 396, 410, 413, 416, 419, - 419, 419, 419, 419, 420, 420, 420, 420, 421, 421, - 421, 421, 425, 429, 424 + 0, 195, 195, 195, 212, 213, 217, 218, 224, 225, + 226, 229, 231, 232, 231, 235, 236, 235, 239, 240, + 239, 243, 244, 243, 247, 248, 247, 251, 252, 251, + 255, 256, 255, 259, 260, 259, 263, 264, 263, 267, + 268, 267, 272, 292, 271, 300, 299, 305, 309, 315, + 319, 325, 329, 335, 339, 345, 349, 355, 359, 365, + 369, 375, 380, 387, 391, 397, 411, 414, 417, 420, + 420, 420, 420, 420, 421, 421, 421, 421, 422, 422, + 422, 422, 426, 430, 425 }; #endif @@ -1399,7 +1400,7 @@ switch (yyn) { case 2: -#line 194 "das.yy" /* yacc.c:1652 */ +#line 195 "das.yy" /* yacc.c:1667 */ { if (!name) name = new string(); if (!type) type = new string(); @@ -1408,150 +1409,150 @@ // push outermost AttrTable PUSH(DAS_OBJ(arg)->get_top_level_attributes()); } -#line 1412 "das.tab.cc" /* yacc.c:1652 */ +#line 1413 "das.tab.cc" /* yacc.c:1667 */ break; case 3: -#line 203 "das.yy" /* yacc.c:1652 */ +#line 204 "das.yy" /* yacc.c:1667 */ { POP; // pop the DAS/AttrTable before stack's dtor delete name; name = 0; delete type; type = 0; delete attr_tab_stack; attr_tab_stack = 0; } -#line 1423 "das.tab.cc" /* yacc.c:1652 */ +#line 1424 "das.tab.cc" /* yacc.c:1667 */ break; case 7: -#line 218 "das.yy" /* yacc.c:1652 */ +#line 219 "das.yy" /* yacc.c:1667 */ { parse_error((parser_arg *)arg, NO_DAS_MSG, das_line_num); } -#line 1431 "das.tab.cc" /* yacc.c:1652 */ +#line 1432 "das.tab.cc" /* yacc.c:1667 */ break; case 12: -#line 230 "das.yy" /* yacc.c:1652 */ +#line 231 "das.yy" /* yacc.c:1667 */ { save_str(*type, "Byte", das_line_num); } -#line 1437 "das.tab.cc" /* yacc.c:1652 */ +#line 1438 "das.tab.cc" /* yacc.c:1667 */ break; case 13: -#line 231 "das.yy" /* yacc.c:1652 */ +#line 232 "das.yy" /* yacc.c:1667 */ { save_str(*name, yyvsp[0], das_line_num); } -#line 1443 "das.tab.cc" /* yacc.c:1652 */ +#line 1444 "das.tab.cc" /* yacc.c:1667 */ break; case 15: -#line 234 "das.yy" /* yacc.c:1652 */ +#line 235 "das.yy" /* yacc.c:1667 */ { save_str(*type, "Int16", das_line_num); } -#line 1449 "das.tab.cc" /* yacc.c:1652 */ +#line 1450 "das.tab.cc" /* yacc.c:1667 */ break; case 16: -#line 235 "das.yy" /* yacc.c:1652 */ +#line 236 "das.yy" /* yacc.c:1667 */ { save_str(*name, yyvsp[0], das_line_num); } -#line 1455 "das.tab.cc" /* yacc.c:1652 */ +#line 1456 "das.tab.cc" /* yacc.c:1667 */ break; case 18: -#line 238 "das.yy" /* yacc.c:1652 */ +#line 239 "das.yy" /* yacc.c:1667 */ { save_str(*type, "UInt16", das_line_num); } -#line 1461 "das.tab.cc" /* yacc.c:1652 */ +#line 1462 "das.tab.cc" /* yacc.c:1667 */ break; case 19: -#line 239 "das.yy" /* yacc.c:1652 */ +#line 240 "das.yy" /* yacc.c:1667 */ { save_str(*name, yyvsp[0], das_line_num); } -#line 1467 "das.tab.cc" /* yacc.c:1652 */ +#line 1468 "das.tab.cc" /* yacc.c:1667 */ break; case 21: -#line 242 "das.yy" /* yacc.c:1652 */ +#line 243 "das.yy" /* yacc.c:1667 */ { save_str(*type, "Int32", das_line_num); } -#line 1473 "das.tab.cc" /* yacc.c:1652 */ +#line 1474 "das.tab.cc" /* yacc.c:1667 */ break; case 22: -#line 243 "das.yy" /* yacc.c:1652 */ +#line 244 "das.yy" /* yacc.c:1667 */ { save_str(*name, yyvsp[0], das_line_num); } -#line 1479 "das.tab.cc" /* yacc.c:1652 */ +#line 1480 "das.tab.cc" /* yacc.c:1667 */ break; case 24: -#line 246 "das.yy" /* yacc.c:1652 */ +#line 247 "das.yy" /* yacc.c:1667 */ { save_str(*type, "UInt32", das_line_num); } -#line 1485 "das.tab.cc" /* yacc.c:1652 */ +#line 1486 "das.tab.cc" /* yacc.c:1667 */ break; case 25: -#line 247 "das.yy" /* yacc.c:1652 */ +#line 248 "das.yy" /* yacc.c:1667 */ { save_str(*name, yyvsp[0], das_line_num); } -#line 1491 "das.tab.cc" /* yacc.c:1652 */ +#line 1492 "das.tab.cc" /* yacc.c:1667 */ break; case 27: -#line 250 "das.yy" /* yacc.c:1652 */ +#line 251 "das.yy" /* yacc.c:1667 */ { save_str(*type, "Float32", das_line_num); } -#line 1497 "das.tab.cc" /* yacc.c:1652 */ +#line 1498 "das.tab.cc" /* yacc.c:1667 */ break; case 28: -#line 251 "das.yy" /* yacc.c:1652 */ +#line 252 "das.yy" /* yacc.c:1667 */ { save_str(*name, yyvsp[0], das_line_num); } -#line 1503 "das.tab.cc" /* yacc.c:1652 */ +#line 1504 "das.tab.cc" /* yacc.c:1667 */ break; case 30: -#line 254 "das.yy" /* yacc.c:1652 */ +#line 255 "das.yy" /* yacc.c:1667 */ { save_str(*type, "Float64", das_line_num); } -#line 1509 "das.tab.cc" /* yacc.c:1652 */ +#line 1510 "das.tab.cc" /* yacc.c:1667 */ break; case 31: -#line 255 "das.yy" /* yacc.c:1652 */ +#line 256 "das.yy" /* yacc.c:1667 */ { save_str(*name, yyvsp[0], das_line_num); } -#line 1515 "das.tab.cc" /* yacc.c:1652 */ +#line 1516 "das.tab.cc" /* yacc.c:1667 */ break; case 33: -#line 258 "das.yy" /* yacc.c:1652 */ +#line 259 "das.yy" /* yacc.c:1667 */ { *type = "String"; } -#line 1521 "das.tab.cc" /* yacc.c:1652 */ +#line 1522 "das.tab.cc" /* yacc.c:1667 */ break; case 34: -#line 259 "das.yy" /* yacc.c:1652 */ +#line 260 "das.yy" /* yacc.c:1667 */ { *name = yyvsp[0]; } -#line 1527 "das.tab.cc" /* yacc.c:1652 */ +#line 1528 "das.tab.cc" /* yacc.c:1667 */ break; case 36: -#line 262 "das.yy" /* yacc.c:1652 */ +#line 263 "das.yy" /* yacc.c:1667 */ { *type = "Url"; } -#line 1533 "das.tab.cc" /* yacc.c:1652 */ +#line 1534 "das.tab.cc" /* yacc.c:1667 */ break; case 37: -#line 263 "das.yy" /* yacc.c:1652 */ +#line 264 "das.yy" /* yacc.c:1667 */ { *name = yyvsp[0]; } -#line 1539 "das.tab.cc" /* yacc.c:1652 */ +#line 1540 "das.tab.cc" /* yacc.c:1667 */ break; case 39: -#line 266 "das.yy" /* yacc.c:1652 */ +#line 267 "das.yy" /* yacc.c:1667 */ { *type = "OtherXML"; } -#line 1545 "das.tab.cc" /* yacc.c:1652 */ +#line 1546 "das.tab.cc" /* yacc.c:1667 */ break; case 40: -#line 267 "das.yy" /* yacc.c:1652 */ +#line 268 "das.yy" /* yacc.c:1667 */ { *name = yyvsp[0]; } -#line 1551 "das.tab.cc" /* yacc.c:1652 */ +#line 1552 "das.tab.cc" /* yacc.c:1667 */ break; case 42: -#line 271 "das.yy" /* yacc.c:1652 */ +#line 272 "das.yy" /* yacc.c:1667 */ { DBG(cerr << "Processing ID: " << yyvsp[0] << endl); @@ -1571,175 +1572,175 @@ DBG(cerr << " Pushed attr_tab: " << at << endl); } -#line 1575 "das.tab.cc" /* yacc.c:1652 */ +#line 1576 "das.tab.cc" /* yacc.c:1667 */ break; case 43: -#line 291 "das.yy" /* yacc.c:1652 */ +#line 292 "das.yy" /* yacc.c:1667 */ { /* pop top of stack; store in attr_tab */ DBG(cerr << " Popped attr_tab: " << TOP_OF_STACK << endl); POP; } -#line 1585 "das.tab.cc" /* yacc.c:1652 */ +#line 1586 "das.tab.cc" /* yacc.c:1667 */ break; case 45: -#line 299 "das.yy" /* yacc.c:1652 */ +#line 300 "das.yy" /* yacc.c:1667 */ { parse_error(ATTR_TUPLE_MSG, das_line_num, yyvsp[0]); } -#line 1593 "das.tab.cc" /* yacc.c:1652 */ +#line 1594 "das.tab.cc" /* yacc.c:1667 */ break; case 47: -#line 305 "das.yy" /* yacc.c:1652 */ +#line 306 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_byte); } -#line 1601 "das.tab.cc" /* yacc.c:1652 */ +#line 1602 "das.tab.cc" /* yacc.c:1667 */ break; case 48: -#line 309 "das.yy" /* yacc.c:1652 */ +#line 310 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_byte); } -#line 1609 "das.tab.cc" /* yacc.c:1652 */ +#line 1610 "das.tab.cc" /* yacc.c:1667 */ break; case 49: -#line 315 "das.yy" /* yacc.c:1652 */ +#line 316 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_int16); } -#line 1617 "das.tab.cc" /* yacc.c:1652 */ +#line 1618 "das.tab.cc" /* yacc.c:1667 */ break; case 50: -#line 319 "das.yy" /* yacc.c:1652 */ +#line 320 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_int16); } -#line 1625 "das.tab.cc" /* yacc.c:1652 */ +#line 1626 "das.tab.cc" /* yacc.c:1667 */ break; case 51: -#line 325 "das.yy" /* yacc.c:1652 */ +#line 326 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_uint16); } -#line 1633 "das.tab.cc" /* yacc.c:1652 */ +#line 1634 "das.tab.cc" /* yacc.c:1667 */ break; case 52: -#line 329 "das.yy" /* yacc.c:1652 */ +#line 330 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_uint16); } -#line 1641 "das.tab.cc" /* yacc.c:1652 */ +#line 1642 "das.tab.cc" /* yacc.c:1667 */ break; case 53: -#line 335 "das.yy" /* yacc.c:1652 */ +#line 336 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_int32); } -#line 1649 "das.tab.cc" /* yacc.c:1652 */ +#line 1650 "das.tab.cc" /* yacc.c:1667 */ break; case 54: -#line 339 "das.yy" /* yacc.c:1652 */ +#line 340 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_int32); } -#line 1657 "das.tab.cc" /* yacc.c:1652 */ +#line 1658 "das.tab.cc" /* yacc.c:1667 */ break; case 55: -#line 345 "das.yy" /* yacc.c:1652 */ +#line 346 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_uint32); } -#line 1665 "das.tab.cc" /* yacc.c:1652 */ +#line 1666 "das.tab.cc" /* yacc.c:1667 */ break; case 56: -#line 349 "das.yy" /* yacc.c:1652 */ +#line 350 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_uint32); } -#line 1673 "das.tab.cc" /* yacc.c:1652 */ +#line 1674 "das.tab.cc" /* yacc.c:1667 */ break; case 57: -#line 355 "das.yy" /* yacc.c:1652 */ +#line 356 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_float32); } -#line 1681 "das.tab.cc" /* yacc.c:1652 */ +#line 1682 "das.tab.cc" /* yacc.c:1667 */ break; case 58: -#line 359 "das.yy" /* yacc.c:1652 */ +#line 360 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_float32); } -#line 1689 "das.tab.cc" /* yacc.c:1652 */ +#line 1690 "das.tab.cc" /* yacc.c:1667 */ break; case 59: -#line 365 "das.yy" /* yacc.c:1652 */ +#line 366 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_float64); } -#line 1697 "das.tab.cc" /* yacc.c:1652 */ +#line 1698 "das.tab.cc" /* yacc.c:1667 */ break; case 60: -#line 369 "das.yy" /* yacc.c:1652 */ +#line 370 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_float64); } -#line 1705 "das.tab.cc" /* yacc.c:1652 */ +#line 1706 "das.tab.cc" /* yacc.c:1667 */ break; case 61: -#line 375 "das.yy" /* yacc.c:1652 */ +#line 376 "das.yy" /* yacc.c:1667 */ { string attr = remove_quotes(yyvsp[0]); add_attribute(*type, *name, attr, 0); } -#line 1714 "das.tab.cc" /* yacc.c:1652 */ +#line 1715 "das.tab.cc" /* yacc.c:1667 */ break; case 62: -#line 380 "das.yy" /* yacc.c:1652 */ +#line 381 "das.yy" /* yacc.c:1667 */ { string attr = remove_quotes(yyvsp[0]); add_attribute(*type, *name, attr, 0); } -#line 1723 "das.tab.cc" /* yacc.c:1652 */ +#line 1724 "das.tab.cc" /* yacc.c:1667 */ break; case 63: -#line 387 "das.yy" /* yacc.c:1652 */ +#line 388 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_url); } -#line 1731 "das.tab.cc" /* yacc.c:1652 */ +#line 1732 "das.tab.cc" /* yacc.c:1667 */ break; case 64: -#line 391 "das.yy" /* yacc.c:1652 */ +#line 392 "das.yy" /* yacc.c:1667 */ { add_attribute(*type, *name, yyvsp[0], &check_url); } -#line 1739 "das.tab.cc" /* yacc.c:1652 */ +#line 1740 "das.tab.cc" /* yacc.c:1667 */ break; case 65: -#line 397 "das.yy" /* yacc.c:1652 */ +#line 398 "das.yy" /* yacc.c:1667 */ { // XML must be quoted in the DAS but the quotes are an // artifact of the DAS syntax so they are not part of the @@ -1751,28 +1752,28 @@ else add_attribute(*type, *name, xml, 0); } -#line 1755 "das.tab.cc" /* yacc.c:1652 */ +#line 1756 "das.tab.cc" /* yacc.c:1667 */ break; case 82: -#line 425 "das.yy" /* yacc.c:1652 */ +#line 426 "das.yy" /* yacc.c:1667 */ { *name = yyvsp[0]; } -#line 1763 "das.tab.cc" /* yacc.c:1652 */ +#line 1764 "das.tab.cc" /* yacc.c:1667 */ break; case 83: -#line 429 "das.yy" /* yacc.c:1652 */ +#line 430 "das.yy" /* yacc.c:1667 */ { add_alias( DAS_OBJ(arg)->get_top_level_attributes(), TOP_OF_STACK, *name, string(yyvsp[0]) ) ; } -#line 1772 "das.tab.cc" /* yacc.c:1652 */ +#line 1773 "das.tab.cc" /* yacc.c:1667 */ break; -#line 1776 "das.tab.cc" /* yacc.c:1652 */ +#line 1777 "das.tab.cc" /* yacc.c:1667 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2003,7 +2004,7 @@ #endif return yyresult; } -#line 436 "das.yy" /* yacc.c:1918 */ +#line 437 "das.yy" /* yacc.c:1918 */ // This function is required for linking, but DODS uses its own error diff -Nru libdap-3.20.4/das.tab.hh libdap-3.20.5/das.tab.hh --- libdap-3.20.4/das.tab.hh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/das.tab.hh 2020-02-17 07:35:45.000000000 +0000 @@ -44,11 +44,12 @@ extern int dasdebug; #endif /* "%code requires" blocks. */ -#line 40 "das.yy" /* yacc.c:1921 */ +#line 40 "das.yy" /* yacc.c:1927 */ #define YYSTYPE char * #define ATTR_STRING_QUOTE_FIX +#define YYERROR_VERBOSE 0 #include "config.h" @@ -89,7 +90,7 @@ extern int das_line_num; /* defined in das.lex */ -#line 93 "das.tab.hh" /* yacc.c:1921 */ +#line 94 "das.tab.hh" /* yacc.c:1927 */ /* Token type. */ #ifndef YYTOKENTYPE diff -Nru libdap-3.20.4/das.yy libdap-3.20.5/das.yy --- libdap-3.20.4/das.yy 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/das.yy 2020-02-17 07:35:45.000000000 +0000 @@ -41,6 +41,7 @@ #define YYSTYPE char * #define ATTR_STRING_QUOTE_FIX +#define YYERROR_VERBOSE 0 #include "config.h" diff -Nru libdap-3.20.4/dds.tab.cc libdap-3.20.5/dds.tab.cc --- libdap-3.20.4/dds.tab.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/dds.tab.cc 2020-02-17 07:35:45.000000000 +0000 @@ -146,13 +146,14 @@ // ERROR is no longer used. These parsers now signal problems by throwing // exceptions. 5/22/2002 jhrg #define DDS_OBJ(arg) ((DDS *)((parser_arg *)(arg))->_object) +#define YYERROR_VERBOSE 0 // #define YYPARSE_PARAM arg extern int dds_line_num; /* defined in dds.lex */ -#line 156 "dds.tab.cc" /* yacc.c:352 */ +#line 157 "dds.tab.cc" /* yacc.c:352 */ /* Token type. */ #ifndef YYTOKENTYPE @@ -183,12 +184,12 @@ union YYSTYPE { -#line 131 "dds.yy" /* yacc.c:352 */ +#line 132 "dds.yy" /* yacc.c:352 */ bool boolean; char word[ID_MAX]; -#line 192 "dds.tab.cc" /* yacc.c:352 */ +#line 193 "dds.tab.cc" /* yacc.c:352 */ }; typedef union YYSTYPE YYSTYPE; @@ -205,7 +206,7 @@ /* Unqualified %code blocks. */ -#line 93 "dds.yy" /* yacc.c:355 */ +#line 94 "dds.yy" /* yacc.c:355 */ // No global static objects in the dap library! 1/24/2000 jhrg @@ -233,7 +234,7 @@ char *type, char *name); -#line 237 "dds.tab.cc" /* yacc.c:355 */ +#line 238 "dds.tab.cc" /* yacc.c:355 */ #ifdef short # undef short @@ -523,12 +524,12 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 160, 160, 160, 176, 177, 180, 184, 193, 196, - 197, 206, 221, 220, 242, 241, 263, 275, 287, 262, - 308, 318, 324, 330, 336, 337, 338, 339, 340, 341, - 342, 343, 344, 347, 348, 351, 351, 351, 351, 351, - 352, 352, 352, 352, 353, 353, 353, 353, 354, 357, - 379, 383, 378, 409, 419, 420, 421 + 0, 161, 161, 161, 177, 178, 181, 185, 194, 197, + 198, 207, 222, 221, 243, 242, 264, 276, 288, 263, + 309, 319, 325, 331, 337, 338, 339, 340, 341, 342, + 343, 344, 345, 348, 349, 352, 352, 352, 352, 352, + 353, 353, 353, 353, 354, 354, 354, 354, 355, 358, + 380, 384, 379, 410, 420, 421, 422 }; #endif @@ -1389,7 +1390,7 @@ switch (yyn) { case 2: -#line 160 "dds.yy" /* yacc.c:1652 */ +#line 161 "dds.yy" /* yacc.c:1667 */ { /* On entry to the parser, make the BaseType stack. I use if (!ctor) here because in the tab.cc file, @@ -1400,57 +1401,57 @@ if (!ctor) ctor = new stack; } -#line 1404 "dds.tab.cc" /* yacc.c:1652 */ +#line 1405 "dds.tab.cc" /* yacc.c:1667 */ break; case 3: -#line 171 "dds.yy" /* yacc.c:1652 */ +#line 172 "dds.yy" /* yacc.c:1667 */ { delete ctor; ctor = 0; } -#line 1412 "dds.tab.cc" /* yacc.c:1652 */ +#line 1413 "dds.tab.cc" /* yacc.c:1667 */ break; case 6: -#line 181 "dds.yy" /* yacc.c:1652 */ +#line 182 "dds.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[-3].boolean) && (yyvsp[-1].boolean); } -#line 1420 "dds.tab.cc" /* yacc.c:1652 */ +#line 1421 "dds.tab.cc" /* yacc.c:1667 */ break; case 7: -#line 185 "dds.yy" /* yacc.c:1652 */ +#line 186 "dds.yy" /* yacc.c:1667 */ { parse_error((parser_arg *)arg, NO_DDS_MSG, dds_line_num, (yyvsp[0].word)); error_exit_cleanup(); YYABORT; } -#line 1430 "dds.tab.cc" /* yacc.c:1652 */ +#line 1431 "dds.tab.cc" /* yacc.c:1667 */ break; case 8: -#line 193 "dds.yy" /* yacc.c:1652 */ +#line 194 "dds.yy" /* yacc.c:1667 */ { (yyval.boolean) = true; } -#line 1438 "dds.tab.cc" /* yacc.c:1652 */ +#line 1439 "dds.tab.cc" /* yacc.c:1667 */ break; case 9: -#line 196 "dds.yy" /* yacc.c:1652 */ +#line 197 "dds.yy" /* yacc.c:1667 */ { (yyval.boolean) = true; } -#line 1444 "dds.tab.cc" /* yacc.c:1652 */ +#line 1445 "dds.tab.cc" /* yacc.c:1667 */ break; case 10: -#line 197 "dds.yy" /* yacc.c:1652 */ +#line 198 "dds.yy" /* yacc.c:1667 */ { (yyval.boolean) = true; } -#line 1450 "dds.tab.cc" /* yacc.c:1652 */ +#line 1451 "dds.tab.cc" /* yacc.c:1667 */ break; case 11: -#line 207 "dds.yy" /* yacc.c:1652 */ +#line 208 "dds.yy" /* yacc.c:1667 */ { string smsg; if (current->check_semantics(smsg)) { @@ -1463,21 +1464,21 @@ strncpy((yyval.word),(yyvsp[-1].word),ID_MAX); (yyval.word)[ID_MAX-1] = '\0'; } -#line 1467 "dds.tab.cc" /* yacc.c:1652 */ +#line 1468 "dds.tab.cc" /* yacc.c:1667 */ break; case 12: -#line 221 "dds.yy" /* yacc.c:1652 */ +#line 222 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ; current = ctor->top(); ctor->pop(); } -#line 1477 "dds.tab.cc" /* yacc.c:1652 */ +#line 1478 "dds.tab.cc" /* yacc.c:1667 */ break; case 13: -#line 227 "dds.yy" /* yacc.c:1652 */ +#line 228 "dds.yy" /* yacc.c:1667 */ { string smsg; if (current->check_semantics(smsg)) { @@ -1491,21 +1492,21 @@ strncpy((yyval.word),(yyvsp[-1].word),ID_MAX); (yyval.word)[ID_MAX-1] = '\0'; } -#line 1495 "dds.tab.cc" /* yacc.c:1652 */ +#line 1496 "dds.tab.cc" /* yacc.c:1667 */ break; case 14: -#line 242 "dds.yy" /* yacc.c:1652 */ +#line 243 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ; current = ctor->top(); ctor->pop(); } -#line 1505 "dds.tab.cc" /* yacc.c:1652 */ +#line 1506 "dds.tab.cc" /* yacc.c:1667 */ break; case 15: -#line 248 "dds.yy" /* yacc.c:1652 */ +#line 249 "dds.yy" /* yacc.c:1667 */ { string smsg; if (current->check_semantics(smsg)) { @@ -1519,11 +1520,11 @@ strncpy((yyval.word),(yyvsp[-1].word),ID_MAX); (yyval.word)[ID_MAX-1] = '\0'; } -#line 1523 "dds.tab.cc" /* yacc.c:1652 */ +#line 1524 "dds.tab.cc" /* yacc.c:1667 */ break; case 16: -#line 263 "dds.yy" /* yacc.c:1652 */ +#line 264 "dds.yy" /* yacc.c:1667 */ { if (is_keyword(string((yyvsp[-1].word)), "array")) { part = libdap::array; @@ -1535,11 +1536,11 @@ YYABORT; } } -#line 1539 "dds.tab.cc" /* yacc.c:1652 */ +#line 1540 "dds.tab.cc" /* yacc.c:1667 */ break; case 17: -#line 275 "dds.yy" /* yacc.c:1652 */ +#line 276 "dds.yy" /* yacc.c:1667 */ { if (is_keyword(string((yyvsp[-1].word)), "maps")) { part = maps; @@ -1551,21 +1552,21 @@ YYABORT; } } -#line 1555 "dds.tab.cc" /* yacc.c:1652 */ +#line 1556 "dds.tab.cc" /* yacc.c:1667 */ break; case 18: -#line 287 "dds.yy" /* yacc.c:1652 */ +#line 288 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ; current = ctor->top(); ctor->pop(); } -#line 1565 "dds.tab.cc" /* yacc.c:1652 */ +#line 1566 "dds.tab.cc" /* yacc.c:1667 */ break; case 19: -#line 293 "dds.yy" /* yacc.c:1652 */ +#line 294 "dds.yy" /* yacc.c:1667 */ { string smsg; if (current->check_semantics(smsg)) { @@ -1580,106 +1581,106 @@ strncpy((yyval.word),(yyvsp[-1].word),ID_MAX); (yyval.word)[ID_MAX-1] = '\0'; } -#line 1584 "dds.tab.cc" /* yacc.c:1652 */ +#line 1585 "dds.tab.cc" /* yacc.c:1667 */ break; case 20: -#line 309 "dds.yy" /* yacc.c:1652 */ +#line 310 "dds.yy" /* yacc.c:1667 */ { ostringstream msg; msg << BAD_DECLARATION; parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word)); YYABORT; } -#line 1595 "dds.tab.cc" /* yacc.c:1652 */ +#line 1596 "dds.tab.cc" /* yacc.c:1667 */ break; case 21: -#line 319 "dds.yy" /* yacc.c:1652 */ +#line 320 "dds.yy" /* yacc.c:1667 */ { ctor->push(DDS_OBJ(arg)->get_factory()->NewStructure()); } -#line 1603 "dds.tab.cc" /* yacc.c:1652 */ +#line 1604 "dds.tab.cc" /* yacc.c:1667 */ break; case 22: -#line 325 "dds.yy" /* yacc.c:1652 */ +#line 326 "dds.yy" /* yacc.c:1667 */ { ctor->push(DDS_OBJ(arg)->get_factory()->NewSequence()); } -#line 1611 "dds.tab.cc" /* yacc.c:1652 */ +#line 1612 "dds.tab.cc" /* yacc.c:1667 */ break; case 23: -#line 331 "dds.yy" /* yacc.c:1652 */ +#line 332 "dds.yy" /* yacc.c:1667 */ { ctor->push(DDS_OBJ(arg)->get_factory()->NewGrid()); } -#line 1619 "dds.tab.cc" /* yacc.c:1652 */ +#line 1620 "dds.tab.cc" /* yacc.c:1667 */ break; case 24: -#line 336 "dds.yy" /* yacc.c:1652 */ +#line 337 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewByte(); } -#line 1625 "dds.tab.cc" /* yacc.c:1652 */ +#line 1626 "dds.tab.cc" /* yacc.c:1667 */ break; case 25: -#line 337 "dds.yy" /* yacc.c:1652 */ +#line 338 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt16(); } -#line 1631 "dds.tab.cc" /* yacc.c:1652 */ +#line 1632 "dds.tab.cc" /* yacc.c:1667 */ break; case 26: -#line 338 "dds.yy" /* yacc.c:1652 */ +#line 339 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt16(); } -#line 1637 "dds.tab.cc" /* yacc.c:1652 */ +#line 1638 "dds.tab.cc" /* yacc.c:1667 */ break; case 27: -#line 339 "dds.yy" /* yacc.c:1652 */ +#line 340 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt32(); } -#line 1643 "dds.tab.cc" /* yacc.c:1652 */ +#line 1644 "dds.tab.cc" /* yacc.c:1667 */ break; case 28: -#line 340 "dds.yy" /* yacc.c:1652 */ +#line 341 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt32(); } -#line 1649 "dds.tab.cc" /* yacc.c:1652 */ +#line 1650 "dds.tab.cc" /* yacc.c:1667 */ break; case 29: -#line 341 "dds.yy" /* yacc.c:1652 */ +#line 342 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat32(); } -#line 1655 "dds.tab.cc" /* yacc.c:1652 */ +#line 1656 "dds.tab.cc" /* yacc.c:1667 */ break; case 30: -#line 342 "dds.yy" /* yacc.c:1652 */ +#line 343 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat64(); } -#line 1661 "dds.tab.cc" /* yacc.c:1652 */ +#line 1662 "dds.tab.cc" /* yacc.c:1667 */ break; case 31: -#line 343 "dds.yy" /* yacc.c:1652 */ +#line 344 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewStr(); } -#line 1667 "dds.tab.cc" /* yacc.c:1652 */ +#line 1668 "dds.tab.cc" /* yacc.c:1667 */ break; case 32: -#line 344 "dds.yy" /* yacc.c:1652 */ +#line 345 "dds.yy" /* yacc.c:1667 */ { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUrl(); } -#line 1673 "dds.tab.cc" /* yacc.c:1652 */ +#line 1674 "dds.tab.cc" /* yacc.c:1667 */ break; case 33: -#line 347 "dds.yy" /* yacc.c:1652 */ +#line 348 "dds.yy" /* yacc.c:1667 */ { current->set_name((yyvsp[0].word)); } -#line 1679 "dds.tab.cc" /* yacc.c:1652 */ +#line 1680 "dds.tab.cc" /* yacc.c:1667 */ break; case 49: -#line 358 "dds.yy" /* yacc.c:1652 */ +#line 359 "dds.yy" /* yacc.c:1667 */ { if (!check_int32((yyvsp[-1].word))) { string msg = "In the dataset descriptor object:\n"; @@ -1699,19 +1700,19 @@ (yyval.boolean) = true; } -#line 1703 "dds.tab.cc" /* yacc.c:1652 */ +#line 1704 "dds.tab.cc" /* yacc.c:1667 */ break; case 50: -#line 379 "dds.yy" /* yacc.c:1652 */ +#line 380 "dds.yy" /* yacc.c:1667 */ { if (!id) id = new string((yyvsp[0].word)); } -#line 1711 "dds.tab.cc" /* yacc.c:1652 */ +#line 1712 "dds.tab.cc" /* yacc.c:1667 */ break; case 51: -#line 383 "dds.yy" /* yacc.c:1652 */ +#line 384 "dds.yy" /* yacc.c:1667 */ { if (!check_int32((yyvsp[0].word))) { string msg = "In the dataset descriptor object:\n"; @@ -1733,19 +1734,19 @@ delete id; id = 0; } -#line 1737 "dds.tab.cc" /* yacc.c:1652 */ +#line 1738 "dds.tab.cc" /* yacc.c:1667 */ break; case 52: -#line 405 "dds.yy" /* yacc.c:1652 */ +#line 406 "dds.yy" /* yacc.c:1667 */ { (yyval.boolean) = true; } -#line 1745 "dds.tab.cc" /* yacc.c:1652 */ +#line 1746 "dds.tab.cc" /* yacc.c:1667 */ break; case 53: -#line 410 "dds.yy" /* yacc.c:1652 */ +#line 411 "dds.yy" /* yacc.c:1667 */ { ostringstream msg; msg << "In the dataset descriptor object:" << endl @@ -1753,23 +1754,23 @@ parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word)); YYABORT; } -#line 1757 "dds.tab.cc" /* yacc.c:1652 */ +#line 1758 "dds.tab.cc" /* yacc.c:1667 */ break; case 54: -#line 419 "dds.yy" /* yacc.c:1652 */ +#line 420 "dds.yy" /* yacc.c:1667 */ { (*DDS_OBJ(arg)).set_dataset_name((yyvsp[0].word)); (yyval.boolean) = true;} -#line 1763 "dds.tab.cc" /* yacc.c:1652 */ +#line 1764 "dds.tab.cc" /* yacc.c:1667 */ break; case 55: -#line 420 "dds.yy" /* yacc.c:1652 */ +#line 421 "dds.yy" /* yacc.c:1667 */ { (*DDS_OBJ(arg)).set_dataset_name((yyvsp[0].word)); (yyval.boolean) = true; } -#line 1769 "dds.tab.cc" /* yacc.c:1652 */ +#line 1770 "dds.tab.cc" /* yacc.c:1667 */ break; case 56: -#line 422 "dds.yy" /* yacc.c:1652 */ +#line 423 "dds.yy" /* yacc.c:1667 */ { ostringstream msg; msg << "Error parsing the dataset name." << endl @@ -1777,11 +1778,11 @@ parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word)); YYABORT; } -#line 1781 "dds.tab.cc" /* yacc.c:1652 */ +#line 1782 "dds.tab.cc" /* yacc.c:1667 */ break; -#line 1785 "dds.tab.cc" /* yacc.c:1652 */ +#line 1786 "dds.tab.cc" /* yacc.c:1667 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2012,7 +2013,7 @@ #endif return yyresult; } -#line 431 "dds.yy" /* yacc.c:1918 */ +#line 432 "dds.yy" /* yacc.c:1918 */ /* diff -Nru libdap-3.20.4/dds.tab.hh libdap-3.20.5/dds.tab.hh --- libdap-3.20.4/dds.tab.hh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/dds.tab.hh 2020-02-17 07:35:45.000000000 +0000 @@ -44,7 +44,7 @@ extern int ddsdebug; #endif /* "%code requires" blocks. */ -#line 47 "dds.yy" /* yacc.c:1921 */ +#line 47 "dds.yy" /* yacc.c:1927 */ #include "config_dap.h" @@ -84,13 +84,14 @@ // ERROR is no longer used. These parsers now signal problems by throwing // exceptions. 5/22/2002 jhrg #define DDS_OBJ(arg) ((DDS *)((parser_arg *)(arg))->_object) +#define YYERROR_VERBOSE 0 // #define YYPARSE_PARAM arg extern int dds_line_num; /* defined in dds.lex */ -#line 94 "dds.tab.hh" /* yacc.c:1921 */ +#line 95 "dds.tab.hh" /* yacc.c:1927 */ /* Token type. */ #ifndef YYTOKENTYPE @@ -121,12 +122,12 @@ union YYSTYPE { -#line 131 "dds.yy" /* yacc.c:1921 */ +#line 132 "dds.yy" /* yacc.c:1927 */ bool boolean; char word[ID_MAX]; -#line 130 "dds.tab.hh" /* yacc.c:1921 */ +#line 131 "dds.tab.hh" /* yacc.c:1927 */ }; typedef union YYSTYPE YYSTYPE; diff -Nru libdap-3.20.4/dds.yy libdap-3.20.5/dds.yy --- libdap-3.20.4/dds.yy 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/dds.yy 2020-02-17 07:35:45.000000000 +0000 @@ -83,6 +83,7 @@ // ERROR is no longer used. These parsers now signal problems by throwing // exceptions. 5/22/2002 jhrg #define DDS_OBJ(arg) ((DDS *)((parser_arg *)(arg))->_object) +#define YYERROR_VERBOSE 0 // #define YYPARSE_PARAM arg diff -Nru libdap-3.20.4/debian/changelog libdap-3.20.5/debian/changelog --- libdap-3.20.4/debian/changelog 2019-12-06 05:21:03.000000000 +0000 +++ libdap-3.20.5/debian/changelog 2020-02-24 02:34:21.000000000 +0000 @@ -1,10 +1,19 @@ -libdap (3.20.4-1~16.04.sav0) xenial; urgency=medium +libdap (3.20.5-1~16.04.sav0) xenial; urgency=medium * Backport to Xenial - * debian/compat,control: Set compat level to 10 and debhelper BD to (>= 11~) - + Add missing flex BD due build failure ("flex: command not found") + * debian/control: Set debhelper-compat (= 10) BD (LP highest for Xenial) - -- Rob Savoury Thu, 05 Dec 2019 21:21:03 -0800 + -- Rob Savoury Sun, 23 Feb 2020 18:34:21 -0800 + +libdap (3.20.5-1) unstable; urgency=medium + + * New upstream release + * Use debhelper-compat (=12) + * Standards-Version: 4.5.0 + * Add debian/gdb.conf file + * Fix DEP-5 syntax error in d/copyright + + -- Alastair McKinstry Mon, 17 Feb 2020 08:57:25 +0000 libdap (3.20.4-1) unstable; urgency=medium diff -Nru libdap-3.20.4/debian/compat libdap-3.20.5/debian/compat --- libdap-3.20.4/debian/compat 2019-12-05 09:52:47.000000000 +0000 +++ libdap-3.20.5/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru libdap-3.20.4/debian/control libdap-3.20.5/debian/control --- libdap-3.20.4/debian/control 2019-12-06 05:21:03.000000000 +0000 +++ libdap-3.20.5/debian/control 2020-02-24 02:34:21.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Alastair McKinstry Build-Depends: zlib1g-dev, - debhelper (>= 11~), + debhelper-compat (= 10), pkg-config, libxml2-dev, libcurl4-gnutls-dev | libcurl-dev, @@ -12,7 +12,6 @@ doxygen, dejagnu, graphviz, - flex, bison, uuid-dev, libjs-jquery, @@ -20,8 +19,8 @@ libssl-dev, libfl-dev Build-Conflicts: autoconf2.13 -Standards-Version: 4.4.0 -Homepage: http://www.opendap.org/ +Standards-Version: 4.5.0 +Homepage: https://www.opendap.org/ Vcs-Browser: https://salsa.debian.org:/science-team/libdap.git Vcs-Git: https://salsa.debian.org:/science-team/libdap.git diff -Nru libdap-3.20.4/debian/copyright libdap-3.20.5/debian/copyright --- libdap-3.20.4/debian/copyright 2019-07-15 09:15:29.000000000 +0000 +++ libdap-3.20.5/debian/copyright 2020-02-17 08:57:25.000000000 +0000 @@ -12,11 +12,11 @@ License: GPL-2 Files: gl/* -Copyright (C) 1995, 1999, 2001-2004, 2006-2013 Free Software Foundation, Inc. +Copyright: 1995, 1999, 2001-2004, 2006-2013 Free Software Foundation, Inc. License: LGPL-2.1 Files: Makefile.am, Makefile.in, deflate.c util_mit.cc -Copyright :1994-2002 World Wide Web Consortium, (Massachusetts Institute of +Copyright: 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). License: W3C diff -Nru libdap-3.20.4/debian/gbp.conf libdap-3.20.5/debian/gbp.conf --- libdap-3.20.4/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ libdap-3.20.5/debian/gbp.conf 2020-02-17 08:57:25.000000000 +0000 @@ -0,0 +1,16 @@ +[DEFAULT] + +# The default name for the upstream branch is "upstream". +# Change it if the name is different (for instance, "master"). +upstream-branch = upstream + +# The default name for the Debian branch is "master". +# Change it if the name is different (for instance, "debian/unstable"). +debian-branch = debian/master + +# git-import-orig uses the following names for the upstream tags. +# Change the value if you are not using git-import-orig +upstream-tag = upstream/%(version)s + +# Always use pristine-tar. +pristine-tar = False diff -Nru libdap-3.20.4/Error.tab.cc libdap-3.20.5/Error.tab.cc --- libdap-3.20.4/Error.tab.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/Error.tab.cc 2020-02-17 07:35:45.000000000 +0000 @@ -130,12 +130,13 @@ #define ERROR_OBJ(arg) ((Error *)((parser_arg *)(arg))->_object) #define STATUS(arg) ((parser_arg *)(arg))->_status +#define YYERROR_VERBOSE 0 //#define YYPARSE_PARAM arg extern int error_line_num; // defined in Error.lex -#line 139 "Error.tab.cc" /* yacc.c:352 */ +#line 140 "Error.tab.cc" /* yacc.c:352 */ /* Token type. */ #ifndef YYTOKENTYPE @@ -155,7 +156,7 @@ union YYSTYPE { -#line 75 "Error.yy" /* yacc.c:352 */ +#line 76 "Error.yy" /* yacc.c:352 */ #ifdef __SUNPRO_CC int boolean; @@ -165,7 +166,7 @@ int integer; char *string; -#line 169 "Error.tab.cc" /* yacc.c:352 */ +#line 170 "Error.tab.cc" /* yacc.c:352 */ }; typedef union YYSTYPE YYSTYPE; @@ -182,14 +183,14 @@ /* Unqualified %code blocks. */ -#line 61 "Error.yy" /* yacc.c:355 */ +#line 62 "Error.yy" /* yacc.c:355 */ int Errorlex(); // the scanner void Errorerror(parser_arg *arg, const string &s); // gotta love automatically generated names... -#line 193 "Error.tab.cc" /* yacc.c:355 */ +#line 194 "Error.tab.cc" /* yacc.c:355 */ #ifdef short # undef short @@ -478,7 +479,7 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 103, 103, 106, 109, 110, 113, 121, 120 + 0, 104, 104, 107, 110, 111, 114, 122, 121 }; #endif @@ -1262,56 +1263,56 @@ switch (yyn) { case 2: -#line 103 "Error.yy" /* yacc.c:1652 */ +#line 104 "Error.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[-2].boolean); STATUS(arg) = (yyvsp[-2].boolean); } -#line 1268 "Error.tab.cc" /* yacc.c:1652 */ +#line 1269 "Error.tab.cc" /* yacc.c:1667 */ break; case 3: -#line 106 "Error.yy" /* yacc.c:1652 */ +#line 107 "Error.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[0].boolean); } -#line 1274 "Error.tab.cc" /* yacc.c:1652 */ +#line 1275 "Error.tab.cc" /* yacc.c:1667 */ break; case 4: -#line 109 "Error.yy" /* yacc.c:1652 */ +#line 110 "Error.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[-1].boolean) && (yyvsp[0].boolean); } -#line 1280 "Error.tab.cc" /* yacc.c:1652 */ +#line 1281 "Error.tab.cc" /* yacc.c:1667 */ break; case 5: -#line 110 "Error.yy" /* yacc.c:1652 */ +#line 111 "Error.yy" /* yacc.c:1667 */ { (yyval.boolean) = (yyvsp[0].boolean); } -#line 1286 "Error.tab.cc" /* yacc.c:1652 */ +#line 1287 "Error.tab.cc" /* yacc.c:1667 */ break; case 6: -#line 114 "Error.yy" /* yacc.c:1652 */ +#line 115 "Error.yy" /* yacc.c:1667 */ { ERROR_OBJ(arg)->set_error_code((ErrorCode)(yyvsp[-1].integer)); (yyval.boolean) = true; } -#line 1295 "Error.tab.cc" /* yacc.c:1652 */ +#line 1296 "Error.tab.cc" /* yacc.c:1667 */ break; case 7: -#line 121 "Error.yy" /* yacc.c:1652 */ +#line 122 "Error.yy" /* yacc.c:1667 */ { ERROR_OBJ(arg)->set_error_message((yyvsp[0].string)); } -#line 1303 "Error.tab.cc" /* yacc.c:1652 */ +#line 1304 "Error.tab.cc" /* yacc.c:1667 */ break; case 8: -#line 125 "Error.yy" /* yacc.c:1652 */ +#line 126 "Error.yy" /* yacc.c:1667 */ { (yyval.boolean) = true; } -#line 1311 "Error.tab.cc" /* yacc.c:1652 */ +#line 1312 "Error.tab.cc" /* yacc.c:1667 */ break; -#line 1315 "Error.tab.cc" /* yacc.c:1652 */ +#line 1316 "Error.tab.cc" /* yacc.c:1667 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1542,7 +1543,7 @@ #endif return yyresult; } -#line 130 "Error.yy" /* yacc.c:1918 */ +#line 131 "Error.yy" /* yacc.c:1918 */ void diff -Nru libdap-3.20.4/Error.tab.hh libdap-3.20.5/Error.tab.hh --- libdap-3.20.4/Error.tab.hh 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/Error.tab.hh 2020-02-17 07:35:45.000000000 +0000 @@ -44,7 +44,7 @@ extern int Errordebug; #endif /* "%code requires" blocks. */ -#line 32 "Error.yy" /* yacc.c:1921 */ +#line 32 "Error.yy" /* yacc.c:1927 */ #include "config_dap.h" @@ -68,12 +68,13 @@ #define ERROR_OBJ(arg) ((Error *)((parser_arg *)(arg))->_object) #define STATUS(arg) ((parser_arg *)(arg))->_status +#define YYERROR_VERBOSE 0 //#define YYPARSE_PARAM arg extern int error_line_num; // defined in Error.lex -#line 77 "Error.tab.hh" /* yacc.c:1921 */ +#line 78 "Error.tab.hh" /* yacc.c:1927 */ /* Token type. */ #ifndef YYTOKENTYPE @@ -93,7 +94,7 @@ union YYSTYPE { -#line 75 "Error.yy" /* yacc.c:1921 */ +#line 76 "Error.yy" /* yacc.c:1927 */ #ifdef __SUNPRO_CC int boolean; @@ -103,7 +104,7 @@ int integer; char *string; -#line 107 "Error.tab.hh" /* yacc.c:1921 */ +#line 108 "Error.tab.hh" /* yacc.c:1927 */ }; typedef union YYSTYPE YYSTYPE; diff -Nru libdap-3.20.4/Error.yy libdap-3.20.5/Error.yy --- libdap-3.20.4/Error.yy 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/Error.yy 2020-02-17 07:35:45.000000000 +0000 @@ -52,6 +52,7 @@ #define ERROR_OBJ(arg) ((Error *)((parser_arg *)(arg))->_object) #define STATUS(arg) ((parser_arg *)(arg))->_status +#define YYERROR_VERBOSE 0 //#define YYPARSE_PARAM arg extern int error_line_num; // defined in Error.lex diff -Nru libdap-3.20.4/getdap4.cc libdap-3.20.5/getdap4.cc --- libdap-3.20.4/getdap4.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/getdap4.cc 2020-02-17 07:35:45.000000000 +0000 @@ -44,6 +44,8 @@ #include #include +#include //SBL 12.3.19 + #include "GetOpt.h" #include "DMR.h" @@ -418,13 +420,16 @@ } cerr << "Exiting." << endl; - return 1; + //return 1; + return EXIT_FAILURE; } catch (exception &e) { cerr << "C++ library exception: " << e.what() << endl; cerr << "Exiting." << endl; - return 1; + //return 1; + return EXIT_FAILURE; } - return 0; + //return 0; + return EXIT_SUCCESS; } diff -Nru libdap-3.20.4/getdap.cc libdap-3.20.5/getdap.cc --- libdap-3.20.4/getdap.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/getdap.cc 2020-02-17 07:35:45.000000000 +0000 @@ -44,6 +44,8 @@ #include #include +#include //SBL 12.3.19 + #include "GetOpt.h" #include "Sequence.h" @@ -61,6 +63,7 @@ extern int libdap::dods_keep_temps; // defined in HTTPResponse.h extern int libdap::www_trace; +extern int libdap::www_trace_extensive; void usage(string name) { @@ -90,6 +93,7 @@ cerr << " x: For each URL, get the (DAP2) DDX object. Does not get data." << endl; cerr << " B: Build a DDX in getdap using the DDS and DAS." << endl; cerr << " v: Verbose output." << endl; + cerr << " e: Extensive (or very) verbose." << endl; cerr << " V: Version of this client; see 'i' for server version." << endl; cerr << " c: is a constraint expression. Used with -D/X and -d/r" << endl; cerr << " NB: You can use a `?' for the CE also." << endl; @@ -135,7 +139,7 @@ int main(int argc, char *argv[]) { - GetOpt getopt(argc, argv, "idaDxrXBVvkc:m:zshM?Hp:t"); + GetOpt getopt(argc, argv, "idaDxrXBVvekc:m:zshM?Hp:t"); int option_char; bool get_das = false; @@ -181,7 +185,13 @@ break; case 'v': verbose = true; + www_trace = 1; break; + case 'e': + verbose = true; + www_trace = 1; + www_trace_extensive = 1; + break; case 'k': dods_keep_temps = 1; break; // keep_temp is in Connect.cc @@ -463,12 +473,15 @@ } catch (Error &e) { cerr << e.get_error_message() << endl; - return 1; + //return 1; + return EXIT_FAILURE; } catch (exception &e) { cerr << "C++ library exception: " << e.what() << endl; - return 1; + //return 1; + return EXIT_FAILURE; } - return 0; + //return 0; + return EXIT_SUCCESS; } diff -Nru libdap-3.20.4/gl/Makefile.in libdap-3.20.5/gl/Makefile.in --- libdap-3.20.4/gl/Makefile.in 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/gl/Makefile.in 2020-02-17 07:35:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -723,6 +723,7 @@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ diff -Nru libdap-3.20.4/HTTPConnect.cc libdap-3.20.5/HTTPConnect.cc --- libdap-3.20.4/HTTPConnect.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/HTTPConnect.cc 2020-02-17 07:35:45.000000000 +0000 @@ -76,6 +76,9 @@ // Set this to 1 to turn on libcurl's verbose mode (for debugging). int www_trace = 0; +// Set this to 1 to turn on libcurl's VERY verbose mode. +int www_trace_extensive = 0; + // Keep the temporary files; useful for debugging. int dods_keep_temps = 0; @@ -288,9 +291,11 @@ case CURLINFO_HEADER_OUT: cerr << "Header out: " << message; break; case CURLINFO_DATA_IN: - cerr << "Data in: " << message; break; + if (www_trace_extensive) + cerr << "Data in: " << message; break; case CURLINFO_DATA_OUT: - cerr << "Data out: " << message; break; + if (www_trace_extensive) + cerr << "Data out: " << message; break; case CURLINFO_END: cerr << "End: " << message; break; #ifdef CURLINFO_SSL_DATA_IN @@ -302,7 +307,8 @@ cerr << "SSL Data out: " << message; break; #endif default: - cerr << "Curl info: " << message; break; + if (www_trace_extensive) + cerr << "Curl info: " << message; break; } return 0; } @@ -371,6 +377,10 @@ curl_easy_setopt(d_curl, CURLOPT_SSL_VERIFYHOST, 0); } + // Set libcurl to use netrc to access data behind URS auth. + // libcurl will use the provided pathname for the ~/.netrc info. 08/23/19 kln + curl_easy_setopt(d_curl, CURLOPT_NETRC, 1); + // Look to see if cookies are turned on in the .dodsrc file. If so, // activate here. We honor 'session cookies' (cookies without an // expiration date) here so that session-based SSO systems will work as diff -Nru libdap-3.20.4/HTTPConnect.h libdap-3.20.5/HTTPConnect.h --- libdap-3.20.4/HTTPConnect.h 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/HTTPConnect.h 2020-02-17 07:35:45.000000000 +0000 @@ -61,6 +61,7 @@ { extern int www_trace; +extern int www_trace_extensive; extern int dods_keep_temps; /** Use the CURL library to dereference a HTTP URL. Scan the response for diff -Nru libdap-3.20.4/INSTALL libdap-3.20.5/INSTALL --- libdap-3.20.4/INSTALL 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/INSTALL 2020-02-17 07:35:45.000000000 +0000 @@ -1,5 +1,5 @@ -Updated for version 3.20.4 of the OPeNDAP DAP2/4 library software. +Updated for version 3.20.5 of the OPeNDAP DAP2/4 library software. Installing the DAP2/4 library diff -Nru libdap-3.20.4/lex.ce_expr.cc libdap-3.20.5/lex.ce_expr.cc --- libdap-3.20.4/lex.ce_expr.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/lex.ce_expr.cc 2020-02-17 07:35:45.000000000 +0000 @@ -28,7 +28,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -66,6 +66,7 @@ typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -73,6 +74,7 @@ typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -103,8 +105,6 @@ #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -352,7 +352,7 @@ /* Begin user sect3 */ -#define ce_exprwrap() 1 +#define ce_exprwrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -379,7 +379,7 @@ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ (yytext_ptr) -= (yy_more_len); \ - ce_exprleng = (size_t) (yy_cp - (yytext_ptr)); \ + ce_exprleng = (yy_size_t) (yy_cp - (yytext_ptr)); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -700,7 +700,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( ce_exprtext, ce_exprleng, 1, ce_exprout )) {} } while (0) +#define ECHO fwrite( ce_exprtext, ce_exprleng, 1, ce_exprout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -711,7 +711,7 @@ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + yy_size_t n; \ for ( n = 0; n < max_size && \ (c = getc( ce_exprin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1261,7 +1261,7 @@ { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); @@ -1394,7 +1394,7 @@ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 65); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } #ifndef YY_NO_INPUT @@ -1445,7 +1445,7 @@ case EOB_ACT_END_OF_FILE: { if ( ce_exprwrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -1581,6 +1581,10 @@ ce_exprfree((void *) b ); } +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a ce_exprrestart() or at EOF. @@ -1785,8 +1789,8 @@ /** Setup the input buffer state to scan the given bytes. The next call to ce_exprlex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1794,8 +1798,7 @@ { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - yy_size_t i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; diff -Nru libdap-3.20.4/lex.das.cc libdap-3.20.5/lex.das.cc --- libdap-3.20.4/lex.das.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/lex.das.cc 2020-02-17 07:35:45.000000000 +0000 @@ -28,7 +28,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -66,6 +66,7 @@ typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -73,6 +74,7 @@ typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -103,8 +105,6 @@ #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -352,7 +352,7 @@ /* Begin user sect3 */ -#define daswrap() 1 +#define daswrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -379,7 +379,7 @@ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ (yytext_ptr) -= (yy_more_len); \ - dasleng = (size_t) (yy_cp - (yytext_ptr)); \ + dasleng = (yy_size_t) (yy_cp - (yytext_ptr)); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -802,7 +802,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( dastext, dasleng, 1, dasout )) {} } while (0) +#define ECHO fwrite( dastext, dasleng, 1, dasout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -813,7 +813,7 @@ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + yy_size_t n; \ for ( n = 0; n < max_size && \ (c = getc( dasin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1375,7 +1375,7 @@ { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); @@ -1508,7 +1508,7 @@ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 187); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } #ifndef YY_NO_INPUT @@ -1559,7 +1559,7 @@ case EOB_ACT_END_OF_FILE: { if ( daswrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -1695,6 +1695,10 @@ dasfree((void *) b ); } +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a dasrestart() or at EOF. @@ -1899,8 +1903,8 @@ /** Setup the input buffer state to scan the given bytes. The next call to daslex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1908,8 +1912,7 @@ { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - yy_size_t i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; diff -Nru libdap-3.20.4/lex.dds.cc libdap-3.20.5/lex.dds.cc --- libdap-3.20.4/lex.dds.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/lex.dds.cc 2020-02-17 07:35:45.000000000 +0000 @@ -28,7 +28,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -66,6 +66,7 @@ typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -73,6 +74,7 @@ typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -103,8 +105,6 @@ #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -352,7 +352,7 @@ /* Begin user sect3 */ -#define ddswrap() 1 +#define ddswrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -378,7 +378,7 @@ */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - ddsleng = (size_t) (yy_cp - yy_bp); \ + ddsleng = (yy_size_t) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -772,7 +772,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( ddstext, ddsleng, 1, ddsout )) {} } while (0) +#define ECHO fwrite( ddstext, ddsleng, 1, ddsout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -783,7 +783,7 @@ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + yy_size_t n; \ for ( n = 0; n < max_size && \ (c = getc( ddsin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1315,7 +1315,7 @@ { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); @@ -1448,7 +1448,7 @@ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 184); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } #ifndef YY_NO_INPUT @@ -1499,7 +1499,7 @@ case EOB_ACT_END_OF_FILE: { if ( ddswrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -1635,6 +1635,10 @@ ddsfree((void *) b ); } +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a ddsrestart() or at EOF. @@ -1839,8 +1843,8 @@ /** Setup the input buffer state to scan the given bytes. The next call to ddslex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1848,8 +1852,7 @@ { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - yy_size_t i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; diff -Nru libdap-3.20.4/lex.Error.cc libdap-3.20.5/lex.Error.cc --- libdap-3.20.4/lex.Error.cc 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/lex.Error.cc 2020-02-17 07:35:45.000000000 +0000 @@ -28,7 +28,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -66,6 +66,7 @@ typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -73,6 +74,7 @@ typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -103,8 +105,6 @@ #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -352,7 +352,7 @@ /* Begin user sect3 */ -#define Errorwrap() 1 +#define Errorwrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -379,7 +379,7 @@ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ (yytext_ptr) -= (yy_more_len); \ - Errorleng = (size_t) (yy_cp - (yytext_ptr)); \ + Errorleng = (yy_size_t) (yy_cp - (yytext_ptr)); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -683,7 +683,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( Errortext, Errorleng, 1, Errorout )) {} } while (0) +#define ECHO fwrite( Errortext, Errorleng, 1, Errorout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -694,7 +694,7 @@ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + yy_size_t n; \ for ( n = 0; n < max_size && \ (c = getc( Errorin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1192,7 +1192,7 @@ { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); @@ -1325,7 +1325,7 @@ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 70); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } #ifndef YY_NO_INPUT @@ -1376,7 +1376,7 @@ case EOB_ACT_END_OF_FILE: { if ( Errorwrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -1512,6 +1512,10 @@ Errorfree((void *) b ); } +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a Errorrestart() or at EOF. @@ -1716,8 +1720,8 @@ /** Setup the input buffer state to scan the given bytes. The next call to Errorlex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1725,8 +1729,7 @@ { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - yy_size_t i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; diff -Nru libdap-3.20.4/libdap.spec libdap-3.20.5/libdap.spec --- libdap-3.20.4/libdap.spec 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/libdap.spec 2020-02-17 07:35:45.000000000 +0000 @@ -1,6 +1,6 @@ Name: libdap Summary: The C++ DAP2/DAP4 library from OPeNDAP -Version: 3.20.4 +Version: 3.20.5 Release: 1%{?dist} License: LGPLv2+ diff -Nru libdap-3.20.4/Makefile.am libdap-3.20.5/Makefile.am --- libdap-3.20.4/Makefile.am 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/Makefile.am 2020-02-17 07:35:45.000000000 +0000 @@ -139,6 +139,15 @@ gh-docs: ./build-gh-docs.sh +# Build a compile_commands.json.tmp file for use with CLion. This will emable +# reasonable use for all the source that's compiled using either 'all' or +# 'check' but other targets will have to be added by hand. See the compiledb +# github site (https://github.com/nickdiego/compiledb) for more info. +# jhrg 9/25/19 +.PHONY: compiledb +compiledb: + make -nwk all check | compiledb + # cccc computes metrics like Lines of code and McCabe. It's available # on the web... .PHONY: cccc diff -Nru libdap-3.20.4/Makefile.in libdap-3.20.5/Makefile.in --- libdap-3.20.4/Makefile.in 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/Makefile.in 2020-02-17 07:35:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -926,6 +926,7 @@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -1363,8 +1364,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -1375,16 +1376,16 @@ touch $@ dods-datatypes-config.h: stamp-h2 - @if test ! -f $@; then rm -f stamp-h2; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi + @test -f $@ || rm -f stamp-h2 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2 stamp-h2: $(srcdir)/dods-datatypes-config.h.in $(top_builddir)/config.status @rm -f stamp-h2 cd $(top_builddir) && $(SHELL) ./config.status dods-datatypes-config.h xdr-datatypes-config.h: stamp-h3 - @if test ! -f $@; then rm -f stamp-h3; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h3; else :; fi + @test -f $@ || rm -f stamp-h3 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h3 stamp-h3: $(srcdir)/xdr-datatypes-config.h.in $(top_builddir)/config.status @rm -f stamp-h3 @@ -2637,10 +2638,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -2913,6 +2920,15 @@ gh-docs: ./build-gh-docs.sh +# Build a compile_commands.json.tmp file for use with CLion. This will emable +# reasonable use for all the source that's compiled using either 'all' or +# 'check' but other targets will have to be added by hand. See the compiledb +# github site (https://github.com/nickdiego/compiledb) for more info. +# jhrg 9/25/19 +.PHONY: compiledb +compiledb: + make -nwk all check | compiledb + # cccc computes metrics like Lines of code and McCabe. It's available # on the web... .PHONY: cccc diff -Nru libdap-3.20.4/NEWS libdap-3.20.5/NEWS --- libdap-3.20.4/NEWS 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/NEWS 2020-02-17 07:35:45.000000000 +0000 @@ -1,3 +1,11 @@ +News for version 3.20.5 + +Fixed memory leaks in imported aws signing code. + +Minor bug fixes. + +Lots of work on CI. + News for version 3.20.4 Fixed memory leaks in the libxml2-based DMR and DDX parsers. diff -Nru libdap-3.20.4/README libdap-3.20.5/README --- libdap-3.20.4/README 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/README 2020-02-17 07:35:45.000000000 +0000 @@ -1,5 +1,11 @@ Please find the libdap4 API documentation here: https://opendap.github.io/libdap4/html/ +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3641778.svg)](https://doi.org/10.5281/zenodo.3641778) + +Updated for version 3.20.5 + +Memory leaks. Minor bug fixes. Lots of work on CI. + Updated for version 3.20.4 Memory leak fixes and C++11 features diff -Nru libdap-3.20.4/tests/DASTest libdap-3.20.5/tests/DASTest --- libdap-3.20.4/tests/DASTest 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/tests/DASTest 2020-02-17 07:35:45.000000000 +0000 @@ -941,7 +941,7 @@ # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -libdap 3.20.4 test suite: das-test test groups: +libdap 3.20.5 test suite: das-test test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -982,7 +982,7 @@ exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (libdap 3.20.4)" && + $as_echo "$as_me (libdap 3.20.5)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1159,11 +1159,11 @@ # Banners and logs. $as_echo "## ----------------------------------- ## -## libdap 3.20.4 test suite: das-test. ## +## libdap 3.20.5 test suite: das-test. ## ## ----------------------------------- ##" { $as_echo "## ----------------------------------- ## -## libdap 3.20.4 test suite: das-test. ## +## libdap 3.20.5 test suite: das-test. ## ## ----------------------------------- ##" echo @@ -2007,7 +2007,7 @@ $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [libdap 3.20.4] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [libdap 3.20.5] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may diff -Nru libdap-3.20.4/tests/DDSTest libdap-3.20.5/tests/DDSTest --- libdap-3.20.4/tests/DDSTest 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/tests/DDSTest 2020-02-17 07:35:45.000000000 +0000 @@ -971,7 +971,7 @@ # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -libdap 3.20.4 test suite: dds-test test groups: +libdap 3.20.5 test suite: dds-test test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1012,7 +1012,7 @@ exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (libdap 3.20.4)" && + $as_echo "$as_me (libdap 3.20.5)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1189,11 +1189,11 @@ # Banners and logs. $as_echo "## ----------------------------------- ## -## libdap 3.20.4 test suite: dds-test. ## +## libdap 3.20.5 test suite: dds-test. ## ## ----------------------------------- ##" { $as_echo "## ----------------------------------- ## -## libdap 3.20.4 test suite: dds-test. ## +## libdap 3.20.5 test suite: dds-test. ## ## ----------------------------------- ##" echo @@ -2037,7 +2037,7 @@ $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [libdap 3.20.4] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [libdap 3.20.5] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may diff -Nru libdap-3.20.4/tests/DMRTest libdap-3.20.5/tests/DMRTest --- libdap-3.20.4/tests/DMRTest 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/tests/DMRTest 2020-02-17 07:35:45.000000000 +0000 @@ -590,241 +590,241 @@ # numerical order. at_format='???' # Description of all the test groups. -at_help_all="1;DMRTest.at:211;parse dmr-testsuite/test_simple_1.xml;parse; -2;DMRTest.at:212;parse dmr-testsuite/test_simple_2.xml;parse; -3;DMRTest.at:213;parse dmr-testsuite/test_simple_3.xml;parse; -4;DMRTest.at:215;parse dmr-testsuite/test_simple_3_error_1.xml;parse; -5;DMRTest.at:216;parse dmr-testsuite/test_simple_3_error_2.xml;parse; -6;DMRTest.at:217;parse dmr-testsuite/test_simple_3_error_3.xml;parse; -7;DMRTest.at:219;parse dmr-testsuite/test_simple_4.xml;parse; -8;DMRTest.at:220;parse dmr-testsuite/test_simple_5.xml;parse; -9;DMRTest.at:221;parse dmr-testsuite/test_simple_6.xml;parse; -10;DMRTest.at:222;parse dmr-testsuite/test_simple_7.xml;parse; -11;DMRTest.at:223;parse dmr-testsuite/test_simple_8.xml;parse; -12;DMRTest.at:224;parse dmr-testsuite/test_simple_9.xml;parse; -13;DMRTest.at:225;parse dmr-testsuite/test_simple_9.1.xml;parse; -14;DMRTest.at:226;parse dmr-testsuite/test_simple_10.xml;parse; -15;DMRTest.at:228;parse dmr-testsuite/test_array_1.xml;parse; -16;DMRTest.at:229;parse dmr-testsuite/test_array_2.xml;parse; -17;DMRTest.at:230;parse dmr-testsuite/test_array_3.xml;parse; -18;DMRTest.at:231;parse dmr-testsuite/test_array_4.xml;parse; -19;DMRTest.at:232;parse dmr-testsuite/test_array_5.xml;parse; -20;DMRTest.at:233;parse dmr-testsuite/test_array_6.xml;parse; -21;DMRTest.at:234;parse dmr-testsuite/test_array_7.xml;parse; -22;DMRTest.at:235;parse dmr-testsuite/test_array_8.xml;parse; -23;DMRTest.at:236;parse dmr-testsuite/test_array_10.xml;parse; -24;DMRTest.at:237;parse dmr-testsuite/test_array_11.xml;parse; -25;DMRTest.at:239;parse dmr-testsuite/ignore_foreign_xml_1.xml;parse; -26;DMRTest.at:240;parse dmr-testsuite/ignore_foreign_xml_2.xml;parse; -27;DMRTest.at:241;parse dmr-testsuite/ignore_foreign_xml_3.xml;parse; -28;DMRTest.at:251;trans test_simple_1.xml;trans; -29;DMRTest.at:252;trans test_simple_2.xml;trans; -30;DMRTest.at:253;trans test_simple_3.xml;trans; -31;DMRTest.at:254;trans test_simple_4.xml;trans; -32;DMRTest.at:255;trans test_simple_5.xml;trans; -33;DMRTest.at:256;trans test_simple_6.xml;trans; -34;DMRTest.at:257;trans test_simple_7.xml;trans; -35;DMRTest.at:258;trans test_simple_8.xml;trans; -36;DMRTest.at:259;trans test_simple_9.xml;trans; -37;DMRTest.at:260;trans test_simple_9.1.xml;trans; -38;DMRTest.at:261;trans test_simple_10.xml;trans; -39;DMRTest.at:263;trans test_array_1.xml;trans; -40;DMRTest.at:264;trans test_array_2.xml;trans; -41;DMRTest.at:265;trans test_array_3.xml;trans; -42;DMRTest.at:266;trans test_array_4.xml;trans; -43;DMRTest.at:267;trans test_array_5.xml;trans; -44;DMRTest.at:268;trans test_array_6.xml;trans; -45;DMRTest.at:269;trans test_array_7.xml;trans; -46;DMRTest.at:270;trans test_array_8.xml;trans; -47;DMRTest.at:271;trans test_array_10.xml;trans; -48;DMRTest.at:272;trans test_array_11.xml;trans; -49;DMRTest.at:274;intern test_simple_1.xml;intern; -50;DMRTest.at:275;intern test_simple_2.xml;intern; -51;DMRTest.at:276;intern test_simple_3.xml;intern; -52;DMRTest.at:277;intern test_simple_4.xml;intern; -53;DMRTest.at:278;intern test_simple_5.xml;intern; -54;DMRTest.at:279;intern test_simple_6.xml;intern; -55;DMRTest.at:280;intern test_simple_7.xml;intern; -56;DMRTest.at:281;intern test_simple_8.xml;intern; -57;DMRTest.at:282;intern test_simple_9.xml;intern; -58;DMRTest.at:283;intern test_simple_9.1.xml;intern; -59;DMRTest.at:284;intern test_simple_10.xml;intern; -60;DMRTest.at:286;intern test_array_1.xml;intern; -61;DMRTest.at:287;intern test_array_2.xml;intern; -62;DMRTest.at:288;intern test_array_3.xml;intern; -63;DMRTest.at:289;intern test_array_4.xml;intern; -64;DMRTest.at:290;intern test_array_5.xml;intern; -65;DMRTest.at:291;intern test_array_6.xml;intern; -66;DMRTest.at:292;intern test_array_7.xml;intern; -67;DMRTest.at:293;intern test_array_8.xml;intern; -68;DMRTest.at:294;intern test_array_10.xml;intern; -69;DMRTest.at:295;intern test_array_11.xml;intern; -70;DMRTest.at:298;parse dmr-testsuite/test_array_9.xml;parse; -71;DMRTest.at:299;parse dmr-testsuite/test_array_12.xml;parse; -72;DMRTest.at:300;parse dmr-testsuite/test_array_13.xml;parse; -73;DMRTest.at:301;parse dmr-testsuite/test_array_14.xml;parse; -74;DMRTest.at:304;parse dmr-testsuite/test_simple_6.2.xml;parse; -75;DMRTest.at:305;parse dmr-testsuite/test_simple_6.3.xml;parse; -76;DMRTest.at:307;trans test_array_9.xml;trans; -77;DMRTest.at:308;trans test_array_12.xml;trans; -78;DMRTest.at:309;trans test_array_13.xml;trans; -79;DMRTest.at:310;trans test_array_14.xml;trans; -80;DMRTest.at:312;trans test_simple_6.2.xml;trans; -81;DMRTest.at:313;trans test_simple_6.3.xml;trans; -82;DMRTest.at:316;trans test_array_9.xml;trans; -83;DMRTest.at:317;trans test_array_12.xml;trans; -84;DMRTest.at:318;trans test_array_13.xml;trans; -85;DMRTest.at:319;trans test_array_14.xml;trans; -86;DMRTest.at:321;trans test_simple_6.2.xml;trans; -87;DMRTest.at:322;trans test_simple_6.3.xml;trans; -88;DMRTest.at:324;intern test_array_9.xml;intern; -89;DMRTest.at:325;intern test_array_12.xml;intern; -90;DMRTest.at:326;intern test_array_13.xml;intern; -91;DMRTest.at:327;intern test_array_14.xml;intern; -92;DMRTest.at:329;intern test_simple_6.2.xml;intern; -93;DMRTest.at:330;intern test_simple_6.3.xml;intern; -94;DMRTest.at:338;trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base;trans_ce; -95;DMRTest.at:338;trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base;trans_ce; -96;DMRTest.at:338;trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base;trans_ce; -97;DMRTest.at:338;trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base;trans_ce; -98;DMRTest.at:338;trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base;trans_ce; -99;DMRTest.at:350;trans ce test_array_4.xml a test_array_4.xml.1.trans_base;trans_ce; -100;DMRTest.at:351;trans ce test_array_4.xml a[][] test_array_4.xml.1.trans_base;trans_ce; -101;DMRTest.at:353;trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base;trans_ce; -102;DMRTest.at:355;trans ce test_array_4.xml /row=[0:1];/col=[3];a[][] test_array_4.xml.4.trans_base;trans_ce; -103;DMRTest.at:357;trans ce test_array_4.xml /row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] test_array_4.xml.5.trans_base;trans_ce; -104;DMRTest.at:359;trans ce test_array_4.xml x[][] /test_array_4.xml.6.trans_base;trans_ce; -105;DMRTest.at:360;trans ce test_array_4.xml /row=[0:1];x[][] test_array_4.xml.7.trans_base;trans_ce; -106;DMRTest.at:362;trans ce test_array_4.xml c[2:][2:] test_array_4.xml.8.trans_base;trans_ce; -107;DMRTest.at:364;trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base;trans_ce; -108;DMRTest.at:365;trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base;trans_ce; -109;DMRTest.at:366;trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base;trans_ce; -110;DMRTest.at:367;trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base;trans_ce; -111;DMRTest.at:369;trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base;trans_ce; -112;DMRTest.at:370;trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base;trans_ce; -113;DMRTest.at:371;trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base;trans_ce; -114;DMRTest.at:372;trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base;trans_ce; -115;DMRTest.at:375;trans ce test_array_6.xml a test_array_6.xml.1.trans_base;trans_ce; -116;DMRTest.at:376;trans ce test_array_6.xml a[][] test_array_6.xml.1.trans_base;trans_ce; -117;DMRTest.at:377;trans ce test_array_6.xml /row=[0:1];a[][] test_array_6.xml.2.trans_base;trans_ce; -118;DMRTest.at:378;trans ce test_array_6.xml /row=[0:1];a[][1:2] test_array_6.xml.3.trans_base;trans_ce; -119;DMRTest.at:381;trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base;trans_ce; -120;DMRTest.at:382;trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base;trans_ce; -121;DMRTest.at:383;trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base;trans_ce; -122;DMRTest.at:384;trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base;trans_ce; -123;DMRTest.at:385;trans ce test_array_6.2.xml a.i[0][1:2] test_array_6.2.xml.3.trans_base;trans_ce; -124;DMRTest.at:386;trans ce test_array_6.2.xml a{i[0][1:2]} test_array_6.2.xml.3.trans_base;trans_ce; -125;DMRTest.at:387;trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2] test_array_6.2.xml.4.trans_base;trans_ce; -126;DMRTest.at:388;trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]} test_array_6.2.xml.4.trans_base;trans_ce; -127;DMRTest.at:390;trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base;trans_ce; -128;DMRTest.at:393;trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base;trans_ce; -129;DMRTest.at:396;trans ce test_array_6.1.xml /row=[1:2];a[][0] test_array_6.1.xml.2.trans_base;trans_ce; -130;DMRTest.at:397;trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j} test_array_6.1.xml.2.trans_base;trans_ce; -131;DMRTest.at:399;trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j} test_array_6.1.xml.2.trans_base;trans_ce; -132;DMRTest.at:402;trans ce test_array_6.1.xml a{i[1:2][1:3];j} test_array_6.1.xml.3.trans_base;trans_ce; -133;DMRTest.at:403;trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j} test_array_6.1.xml.3.trans_base;trans_ce; -134;DMRTest.at:407;trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]} test_array_6.1.xml.4.trans_base;trans_ce; -135;DMRTest.at:410;trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base;trans_ce; -136;DMRTest.at:411;trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base;trans_ce; -137;DMRTest.at:413;trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base;trans_ce; -138;DMRTest.at:414;trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base;trans_ce; -139;DMRTest.at:416;trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base;trans_ce; -140;DMRTest.at:417;trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base;trans_ce; -141;DMRTest.at:418;trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base;trans_ce; -142;DMRTest.at:420;trans ce test_array_7.xml s test_array_7.xml.1.trans_base;trans_ce; -143;DMRTest.at:421;trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base;trans_ce; -144;DMRTest.at:423;trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base;trans_ce; -145;DMRTest.at:424;trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base;trans_ce; -146;DMRTest.at:426;trans ce test_array_7.xml s[1] test_array_7.xml.3.trans_base;trans_ce; -147;DMRTest.at:427;trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base;trans_ce; -148;DMRTest.at:429;trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base;trans_ce; -149;DMRTest.at:432;trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base;trans_ce; -150;DMRTest.at:433;trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base;trans_ce; -151;DMRTest.at:436;trans ce test_array_7.1.xml test_array_7.1.xml.1.trans_base;trans_ce; -152;DMRTest.at:437;trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base;trans_ce; -153;DMRTest.at:439;trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base;trans_ce; -154;DMRTest.at:440;trans ce test_array_7.1.xml s.i1[][] test_array_7.1.xml.2.trans_base;trans_ce; -155;DMRTest.at:441;trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base;trans_ce; -156;DMRTest.at:442;trans ce test_array_7.1.xml s{i1[][]} test_array_7.1.xml.2.trans_base;trans_ce; -157;DMRTest.at:444;trans ce test_array_7.1.xml s.i1[0][0] test_array_7.1.xml.3.trans_base;trans_ce; -158;DMRTest.at:445;trans ce test_array_7.1.xml s{i1[0][0]} test_array_7.1.xml.3.trans_base;trans_ce; -159;DMRTest.at:447;trans ce test_array_7.1.xml s.i1[0:2][1:2] test_array_7.1.xml.4.trans_base;trans_ce; -160;DMRTest.at:451;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s test_array_7.1.xml.5.trans_base;trans_ce; -161;DMRTest.at:453;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1 test_array_7.1.xml.6.trans_base;trans_ce; -162;DMRTest.at:454;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][] test_array_7.1.xml.6.trans_base;trans_ce; -163;DMRTest.at:455;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1} test_array_7.1.xml.6.trans_base;trans_ce; -164;DMRTest.at:456;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]} test_array_7.1.xml.6.trans_base;trans_ce; -165;DMRTest.at:459;trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base;trans_ce; -166;DMRTest.at:460;trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base;trans_ce; -167;DMRTest.at:461;trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base;trans_ce; -168;DMRTest.at:463;trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base;trans_ce; -169;DMRTest.at:464;trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base;trans_ce; -170;DMRTest.at:466;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base;trans_ce; -171;DMRTest.at:467;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base;trans_ce; -172;DMRTest.at:469;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base;trans_ce; -173;DMRTest.at:473;trans test_array_1.xml scale(x,1) test_array_1.xml.1.func_base;trans_func_ce; -174;DMRTest.at:474;trans test_array_1.xml scale(x,10) test_array_1.xml.2.func_base;trans_func_ce; -175;DMRTest.at:475;trans test_array_1.xml scale(x,-10) test_array_1.xml.3.func_base;trans_func_ce; -176;DMRTest.at:476;trans test_array_1.xml scale(x,0.001) test_array_1.xml.4.func_base;trans_func_ce; -177;DMRTest.at:477;trans test_array_1.xml scale(x,-0.001) test_array_1.xml.5.func_base;trans_func_ce; -178;DMRTest.at:481;trans test_array_1.xml scale(x,0x7fffffffffffffff) test_array_1.xml.6.func_base;trans_func_ce; -179;DMRTest.at:483;trans test_array_1.xml scale(x,0x8fffffffffffffff) test_array_1.xml.7.func_base;trans_func_ce; -180;DMRTest.at:487;trans test_array_5.xml scale(a,0.001) test_array_5.xml.1.func_base;trans_func_ce; -181;DMRTest.at:488;trans test_array_5.xml scale(b,0.001) test_array_5.xml.2.func_base;trans_func_ce; -182;DMRTest.at:490;trans test_array_5.xml scale(c,0.001) test_array_5.xml.3.func_base;trans_func_ce; -183;DMRTest.at:491;trans test_array_5.xml scale(d,0.001) test_array_5.xml.4.func_base;trans_func_ce; -184;DMRTest.at:496;trans vol_1_ce_1.xml scale(u,10) vol_1_ce_1.xml.1.func_base;trans_func_ce; -185;DMRTest.at:497;trans vol_1_ce_1.xml scale(u,v) vol_1_ce_1.xml.2.func_base;trans_func_ce; -186;DMRTest.at:498;trans vol_1_ce_1.xml scale(scale(u,10),0.01) vol_1_ce_1.xml.3.func_base;trans_func_ce; -187;DMRTest.at:501;trans vol_1_ce_1.xml scale(Point.x,10) vol_1_ce_1.xml.4.func_base;trans_func_ce; -188;DMRTest.at:502;trans vol_1_ce_1.xml scale(Point.x,Point.y) vol_1_ce_1.xml.5.func_base;trans_func_ce; -189;DMRTest.at:503;trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01) vol_1_ce_1.xml.6.func_base;trans_func_ce; -190;DMRTest.at:506;trans vol_1_ce_1.xml scale(\\\$Byte(20:1,2,3,4),10) vol_1_ce_1.xml.7.func_base;trans_func_ce; -191;DMRTest.at:507;trans vol_1_ce_1.xml scale(\\\$Int8(20:10,11,12,-9),10) vol_1_ce_1.xml.8.func_base;trans_func_ce; -192;DMRTest.at:508;trans vol_1_ce_1.xml scale(\\\$UInt16(20:1,2,3,4),10) vol_1_ce_1.xml.9.func_base;trans_func_ce; -193;DMRTest.at:509;trans vol_1_ce_1.xml scale(\\\$Int16(20:1,2,3,-4),10) vol_1_ce_1.xml.10.func_base;trans_func_ce; -194;DMRTest.at:510;trans vol_1_ce_1.xml scale(\\\$UInt32(20:1,2,3,4),10) vol_1_ce_1.xml.11.func_base;trans_func_ce; -195;DMRTest.at:511;trans vol_1_ce_1.xml scale(\\\$Int32(20:1,2,3,-4),10) vol_1_ce_1.xml.12.func_base;trans_func_ce; -196;DMRTest.at:512;trans vol_1_ce_1.xml scale(\\\$UInt64(20:1,2,3,0xffffffffffffffff),1) vol_1_ce_1.xml.13.func_base;trans_func_ce; -197;DMRTest.at:513;trans vol_1_ce_1.xml scale(\\\$Int64(20:1,2,3,0x7fffffffffffffff),1) vol_1_ce_1.xml.14.func_base;trans_func_ce; -198;DMRTest.at:514;trans vol_1_ce_1.xml scale(\\\$Float32(20:1,2,3,4.55),10) vol_1_ce_1.xml.15.func_base;trans_func_ce; -199;DMRTest.at:515;trans vol_1_ce_1.xml scale(\\\$Float64(20:1,2,3,4.55),10) vol_1_ce_1.xml.16.func_base;trans_func_ce; -200;DMRTest.at:519;trans vol_1_ce_10.xml scale(lat,10) vol_1_ce_10.xml.1.func_base;trans_func_ce; -201;DMRTest.at:520;trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) vol_1_ce_10.xml.2.func_base;trans_func_ce; -202;DMRTest.at:521;trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) lat[10:11][10:11];lon[10:11][10:11] vol_1_ce_10.xml.3.func_base;trans_func_ce; -203;DMRTest.at:528;filter test_simple_7.xml s test_simple_7.xml.f.trans_base;filter; -204;DMRTest.at:530;filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base;filter; -205;DMRTest.at:531;filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base;filter; -206;DMRTest.at:532;filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base;filter; -207;DMRTest.at:533;filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base;filter; -208;DMRTest.at:534;filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base;filter; -209;DMRTest.at:535;filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base;filter; -210;DMRTest.at:536;filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base;filter; -211;DMRTest.at:538;filter test_simple_7.xml s|1024=1024.0 test_simple_7.xml.fa.trans_base;filter; -214;DMRTest.at:542;filter test_simple_7.xml s|s==\\\"Silly test string: 2\\\" test_simple_7.xml.fs1.trans_base;filter; -215;DMRTest.at:543;filter test_simple_7.xml s|s!=\\\"Silly test string: 2\\\" test_simple_7.xml.fs2.trans_base;filter; -216;DMRTest.at:544;filter test_simple_7.xml s|s<\\\"Silly test string: 2\\\" test_simple_7.xml.fs3.trans_base;filter; -217;DMRTest.at:545;filter test_simple_7.xml s|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.fs4.trans_base;filter; -218;DMRTest.at:546;filter test_simple_7.xml s|s>\\\"Silly test string: 2\\\" test_simple_7.xml.fs5.trans_base;filter; -219;DMRTest.at:547;filter test_simple_7.xml s|s>=\\\"Silly test string: 2\\\" test_simple_7.xml.fs6.trans_base;filter; -220;DMRTest.at:548;filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base;filter; -221;DMRTest.at:552;filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base;filter; -222;DMRTest.at:553;filter test_simple_7.xml s{i1}|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.g1.trans_base;filter; -223;DMRTest.at:556;filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base;filter; -224;DMRTest.at:557;filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base;filter; -225;DMRTest.at:558;filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base;filter; -226;DMRTest.at:559;filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base;filter; -227;DMRTest.at:560;filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base;filter; -228;DMRTest.at:567;filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base;filter; -229;DMRTest.at:568;filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base;filter; -230;DMRTest.at:569;filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base;filter; -231;DMRTest.at:571;filter names_with_spaces2.dmr /inst2/\\\"Point Break\\\".x names_with_spaces2.dmr.1.trans_base;filter; -232;DMRTest.at:572;filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base;filter; -233;DMRTest.at:573;filter names_with_spaces2.dmr /inst2/\\\"Point%20Break\\\".x names_with_spaces2.dmr.1.trans_base;filter; -234;DMRTest.at:575;filter names_with_spaces3.dmr /inst2/\\\"New Group\\\"/x names_with_spaces3.dmr.1.trans_base;filter; -235;DMRTest.at:576;filter names_with_spaces3.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base;filter; +at_help_all="1;DMRTest.at:230;parse dmr-testsuite/test_simple_1.xml;parse; +2;DMRTest.at:231;parse dmr-testsuite/test_simple_2.xml;parse; +3;DMRTest.at:232;parse dmr-testsuite/test_simple_3.xml;parse; +4;DMRTest.at:234;parse dmr-testsuite/test_simple_3_error_1.xml;parse; +5;DMRTest.at:235;parse dmr-testsuite/test_simple_3_error_2.xml;parse; +6;DMRTest.at:236;parse dmr-testsuite/test_simple_3_error_3.xml;parse; +7;DMRTest.at:238;parse dmr-testsuite/test_simple_4.xml;parse; +8;DMRTest.at:239;parse dmr-testsuite/test_simple_5.xml;parse; +9;DMRTest.at:240;parse dmr-testsuite/test_simple_6.xml;parse; +10;DMRTest.at:241;parse dmr-testsuite/test_simple_7.xml;parse; +11;DMRTest.at:242;parse dmr-testsuite/test_simple_8.xml;parse; +12;DMRTest.at:243;parse dmr-testsuite/test_simple_9.xml;parse; +13;DMRTest.at:244;parse dmr-testsuite/test_simple_9.1.xml;parse; +14;DMRTest.at:245;parse dmr-testsuite/test_simple_10.xml;parse; +15;DMRTest.at:247;parse dmr-testsuite/test_array_1.xml;parse; +16;DMRTest.at:248;parse dmr-testsuite/test_array_2.xml;parse; +17;DMRTest.at:249;parse dmr-testsuite/test_array_3.xml;parse; +18;DMRTest.at:250;parse dmr-testsuite/test_array_4.xml;parse; +19;DMRTest.at:251;parse dmr-testsuite/test_array_5.xml;parse; +20;DMRTest.at:252;parse dmr-testsuite/test_array_6.xml;parse; +21;DMRTest.at:253;parse dmr-testsuite/test_array_7.xml;parse; +22;DMRTest.at:254;parse dmr-testsuite/test_array_8.xml;parse; +23;DMRTest.at:255;parse dmr-testsuite/test_array_10.xml;parse; +24;DMRTest.at:256;parse dmr-testsuite/test_array_11.xml;parse; +25;DMRTest.at:258;parse dmr-testsuite/ignore_foreign_xml_1.xml;parse; +26;DMRTest.at:259;parse dmr-testsuite/ignore_foreign_xml_2.xml;parse; +27;DMRTest.at:260;parse dmr-testsuite/ignore_foreign_xml_3.xml;parse; +28;DMRTest.at:270;trans test_simple_1.xml;trans; +29;DMRTest.at:271;trans test_simple_2.xml;trans; +30;DMRTest.at:272;trans test_simple_3.xml;trans; +31;DMRTest.at:273;trans test_simple_4.xml;trans; +32;DMRTest.at:274;trans test_simple_5.xml;trans; +33;DMRTest.at:275;trans test_simple_6.xml;trans; +34;DMRTest.at:276;trans test_simple_7.xml;trans; +35;DMRTest.at:277;trans test_simple_8.xml;trans; +36;DMRTest.at:278;trans test_simple_9.xml;trans; +37;DMRTest.at:279;trans test_simple_9.1.xml;trans; +38;DMRTest.at:280;trans test_simple_10.xml;trans; +39;DMRTest.at:282;trans test_array_1.xml;trans; +40;DMRTest.at:283;trans test_array_2.xml;trans; +41;DMRTest.at:284;trans test_array_3.xml;trans; +42;DMRTest.at:285;trans test_array_4.xml;trans; +43;DMRTest.at:286;trans test_array_5.xml;trans; +44;DMRTest.at:287;trans test_array_6.xml;trans; +45;DMRTest.at:288;trans test_array_7.xml;trans; +46;DMRTest.at:289;trans test_array_8.xml;trans; +47;DMRTest.at:290;trans test_array_10.xml;trans; +48;DMRTest.at:291;trans test_array_11.xml;trans; +49;DMRTest.at:293;intern test_simple_1.xml;intern; +50;DMRTest.at:294;intern test_simple_2.xml;intern; +51;DMRTest.at:295;intern test_simple_3.xml;intern; +52;DMRTest.at:296;intern test_simple_4.xml;intern; +53;DMRTest.at:297;intern test_simple_5.xml;intern; +54;DMRTest.at:298;intern test_simple_6.xml;intern; +55;DMRTest.at:299;intern test_simple_7.xml;intern; +56;DMRTest.at:300;intern test_simple_8.xml;intern; +57;DMRTest.at:301;intern test_simple_9.xml;intern; +58;DMRTest.at:302;intern test_simple_9.1.xml;intern; +59;DMRTest.at:303;intern test_simple_10.xml;intern; +60;DMRTest.at:305;intern test_array_1.xml;intern; +61;DMRTest.at:306;intern test_array_2.xml;intern; +62;DMRTest.at:307;intern test_array_3.xml;intern; +63;DMRTest.at:308;intern test_array_4.xml;intern; +64;DMRTest.at:309;intern test_array_5.xml;intern; +65;DMRTest.at:310;intern test_array_6.xml;intern; +66;DMRTest.at:311;intern test_array_7.xml;intern; +67;DMRTest.at:312;intern test_array_8.xml;intern; +68;DMRTest.at:313;intern test_array_10.xml;intern; +69;DMRTest.at:314;intern test_array_11.xml;intern; +70;DMRTest.at:317;parse dmr-testsuite/test_array_9.xml;parse; +71;DMRTest.at:318;parse dmr-testsuite/test_array_12.xml;parse; +72;DMRTest.at:319;parse dmr-testsuite/test_array_13.xml;parse; +73;DMRTest.at:320;parse dmr-testsuite/test_array_14.xml;parse; +74;DMRTest.at:323;parse dmr-testsuite/test_simple_6.2.xml;parse; +75;DMRTest.at:324;parse dmr-testsuite/test_simple_6.3.xml;parse; +76;DMRTest.at:326;trans test_array_9.xml;trans; +77;DMRTest.at:327;trans test_array_12.xml;trans; +78;DMRTest.at:328;trans test_array_13.xml;trans; +79;DMRTest.at:329;trans test_array_14.xml;trans; +80;DMRTest.at:331;trans test_simple_6.2.xml;trans; +81;DMRTest.at:332;trans test_simple_6.3.xml;trans; +82;DMRTest.at:335;trans test_array_9.xml;trans; +83;DMRTest.at:336;trans test_array_12.xml;trans; +84;DMRTest.at:337;trans test_array_13.xml;trans; +85;DMRTest.at:338;trans test_array_14.xml;trans; +86;DMRTest.at:340;trans test_simple_6.2.xml;trans; +87;DMRTest.at:341;trans test_simple_6.3.xml;trans; +88;DMRTest.at:343;intern test_array_9.xml;intern; +89;DMRTest.at:344;intern test_array_12.xml;intern; +90;DMRTest.at:345;intern test_array_13.xml;intern; +91;DMRTest.at:346;intern test_array_14.xml;intern; +92;DMRTest.at:348;intern test_simple_6.2.xml;intern; +93;DMRTest.at:349;intern test_simple_6.3.xml;intern; +94;DMRTest.at:365;trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base;trans_ce; +95;DMRTest.at:365;trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base;trans_ce; +96;DMRTest.at:365;trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base;trans_ce; +97;DMRTest.at:365;trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base;trans_ce; +98;DMRTest.at:365;trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base;trans_ce; +99;DMRTest.at:369;trans ce test_array_4.xml a test_array_4.xml.1.trans_base;trans_ce; +100;DMRTest.at:370;trans ce test_array_4.xml a[][] test_array_4.xml.1.trans_base;trans_ce; +101;DMRTest.at:372;trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base;trans_ce; +102;DMRTest.at:374;trans ce test_array_4.xml /row=[0:1];/col=[3];a[][] test_array_4.xml.4.trans_base;trans_ce; +103;DMRTest.at:376;trans ce test_array_4.xml /row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] test_array_4.xml.5.trans_base;trans_ce; +104;DMRTest.at:378;trans ce test_array_4.xml x[][] /test_array_4.xml.6.trans_base;trans_ce; +105;DMRTest.at:379;trans ce test_array_4.xml /row=[0:1];x[][] test_array_4.xml.7.trans_base;trans_ce; +106;DMRTest.at:381;trans ce test_array_4.xml c[2:][2:] test_array_4.xml.8.trans_base;trans_ce; +107;DMRTest.at:383;trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base;trans_ce; +108;DMRTest.at:384;trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base;trans_ce; +109;DMRTest.at:385;trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base;trans_ce; +110;DMRTest.at:386;trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base;trans_ce; +111;DMRTest.at:388;trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base;trans_ce; +112;DMRTest.at:389;trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base;trans_ce; +113;DMRTest.at:390;trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base;trans_ce; +114;DMRTest.at:391;trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base;trans_ce; +115;DMRTest.at:394;trans ce test_array_6.xml a test_array_6.xml.1.trans_base;trans_ce; +116;DMRTest.at:395;trans ce test_array_6.xml a[][] test_array_6.xml.1.trans_base;trans_ce; +117;DMRTest.at:396;trans ce test_array_6.xml /row=[0:1];a[][] test_array_6.xml.2.trans_base;trans_ce; +118;DMRTest.at:397;trans ce test_array_6.xml /row=[0:1];a[][1:2] test_array_6.xml.3.trans_base;trans_ce; +119;DMRTest.at:400;trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base;trans_ce; +120;DMRTest.at:401;trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base;trans_ce; +121;DMRTest.at:402;trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base;trans_ce; +122;DMRTest.at:403;trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base;trans_ce; +123;DMRTest.at:404;trans ce test_array_6.2.xml a.i[0][1:2] test_array_6.2.xml.3.trans_base;trans_ce; +124;DMRTest.at:405;trans ce test_array_6.2.xml a{i[0][1:2]} test_array_6.2.xml.3.trans_base;trans_ce; +125;DMRTest.at:406;trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2] test_array_6.2.xml.4.trans_base;trans_ce; +126;DMRTest.at:407;trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]} test_array_6.2.xml.4.trans_base;trans_ce; +127;DMRTest.at:409;trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base;trans_ce; +128;DMRTest.at:412;trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base;trans_ce; +129;DMRTest.at:415;trans ce test_array_6.1.xml /row=[1:2];a[][0] test_array_6.1.xml.2.trans_base;trans_ce; +130;DMRTest.at:416;trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j} test_array_6.1.xml.2.trans_base;trans_ce; +131;DMRTest.at:418;trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j} test_array_6.1.xml.2.trans_base;trans_ce; +132;DMRTest.at:421;trans ce test_array_6.1.xml a{i[1:2][1:3];j} test_array_6.1.xml.3.trans_base;trans_ce; +133;DMRTest.at:422;trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j} test_array_6.1.xml.3.trans_base;trans_ce; +134;DMRTest.at:426;trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]} test_array_6.1.xml.4.trans_base;trans_ce; +135;DMRTest.at:429;trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base;trans_ce; +136;DMRTest.at:430;trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base;trans_ce; +137;DMRTest.at:432;trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base;trans_ce; +138;DMRTest.at:433;trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base;trans_ce; +139;DMRTest.at:435;trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base;trans_ce; +140;DMRTest.at:436;trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base;trans_ce; +141;DMRTest.at:437;trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base;trans_ce; +142;DMRTest.at:439;trans ce test_array_7.xml s test_array_7.xml.1.trans_base;trans_ce; +143;DMRTest.at:440;trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base;trans_ce; +144;DMRTest.at:442;trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base;trans_ce; +145;DMRTest.at:443;trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base;trans_ce; +146;DMRTest.at:445;trans ce test_array_7.xml s[1] test_array_7.xml.3.trans_base;trans_ce; +147;DMRTest.at:446;trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base;trans_ce; +148;DMRTest.at:448;trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base;trans_ce; +149;DMRTest.at:451;trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base;trans_ce; +150;DMRTest.at:452;trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base;trans_ce; +151;DMRTest.at:455;trans ce test_array_7.1.xml test_array_7.1.xml.1.trans_base;trans_ce; +152;DMRTest.at:456;trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base;trans_ce; +153;DMRTest.at:458;trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base;trans_ce; +154;DMRTest.at:459;trans ce test_array_7.1.xml s.i1[][] test_array_7.1.xml.2.trans_base;trans_ce; +155;DMRTest.at:460;trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base;trans_ce; +156;DMRTest.at:461;trans ce test_array_7.1.xml s{i1[][]} test_array_7.1.xml.2.trans_base;trans_ce; +157;DMRTest.at:463;trans ce test_array_7.1.xml s.i1[0][0] test_array_7.1.xml.3.trans_base;trans_ce; +158;DMRTest.at:464;trans ce test_array_7.1.xml s{i1[0][0]} test_array_7.1.xml.3.trans_base;trans_ce; +159;DMRTest.at:466;trans ce test_array_7.1.xml s.i1[0:2][1:2] test_array_7.1.xml.4.trans_base;trans_ce; +160;DMRTest.at:470;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s test_array_7.1.xml.5.trans_base;trans_ce; +161;DMRTest.at:472;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1 test_array_7.1.xml.6.trans_base;trans_ce; +162;DMRTest.at:473;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][] test_array_7.1.xml.6.trans_base;trans_ce; +163;DMRTest.at:474;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1} test_array_7.1.xml.6.trans_base;trans_ce; +164;DMRTest.at:475;trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]} test_array_7.1.xml.6.trans_base;trans_ce; +165;DMRTest.at:478;trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base;trans_ce; +166;DMRTest.at:479;trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base;trans_ce; +167;DMRTest.at:480;trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base;trans_ce; +168;DMRTest.at:482;trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base;trans_ce; +169;DMRTest.at:483;trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base;trans_ce; +170;DMRTest.at:485;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base;trans_ce; +171;DMRTest.at:486;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base;trans_ce; +172;DMRTest.at:488;trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base;trans_ce; +173;DMRTest.at:492;trans test_array_1.xml scale(x,1) test_array_1.xml.1.func_base;trans_func_ce; +174;DMRTest.at:493;trans test_array_1.xml scale(x,10) test_array_1.xml.2.func_base;trans_func_ce; +175;DMRTest.at:494;trans test_array_1.xml scale(x,-10) test_array_1.xml.3.func_base;trans_func_ce; +176;DMRTest.at:495;trans test_array_1.xml scale(x,0.001) test_array_1.xml.4.func_base;trans_func_ce; +177;DMRTest.at:496;trans test_array_1.xml scale(x,-0.001) test_array_1.xml.5.func_base;trans_func_ce; +178;DMRTest.at:500;trans test_array_1.xml scale(x,0x7fffffffffffffff) test_array_1.xml.6.func_base;trans_func_ce; +179;DMRTest.at:502;trans test_array_1.xml scale(x,0x8fffffffffffffff) test_array_1.xml.7.func_base;trans_func_ce; +180;DMRTest.at:506;trans test_array_5.xml scale(a,0.001) test_array_5.xml.1.func_base;trans_func_ce; +181;DMRTest.at:507;trans test_array_5.xml scale(b,0.001) test_array_5.xml.2.func_base;trans_func_ce; +182;DMRTest.at:509;trans test_array_5.xml scale(c,0.001) test_array_5.xml.3.func_base;trans_func_ce; +183;DMRTest.at:510;trans test_array_5.xml scale(d,0.001) test_array_5.xml.4.func_base;trans_func_ce; +184;DMRTest.at:515;trans vol_1_ce_1.xml scale(u,10) vol_1_ce_1.xml.1.func_base;trans_func_ce; +185;DMRTest.at:516;trans vol_1_ce_1.xml scale(u,v) vol_1_ce_1.xml.2.func_base;trans_func_ce; +186;DMRTest.at:517;trans vol_1_ce_1.xml scale(scale(u,10),0.01) vol_1_ce_1.xml.3.func_base;trans_func_ce; +187;DMRTest.at:520;trans vol_1_ce_1.xml scale(Point.x,10) vol_1_ce_1.xml.4.func_base;trans_func_ce; +188;DMRTest.at:521;trans vol_1_ce_1.xml scale(Point.x,Point.y) vol_1_ce_1.xml.5.func_base;trans_func_ce; +189;DMRTest.at:522;trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01) vol_1_ce_1.xml.6.func_base;trans_func_ce; +190;DMRTest.at:525;trans vol_1_ce_1.xml scale(\\\$Byte(20:1,2,3,4),10) vol_1_ce_1.xml.7.func_base;trans_func_ce; +191;DMRTest.at:526;trans vol_1_ce_1.xml scale(\\\$Int8(20:10,11,12,-9),10) vol_1_ce_1.xml.8.func_base;trans_func_ce; +192;DMRTest.at:527;trans vol_1_ce_1.xml scale(\\\$UInt16(20:1,2,3,4),10) vol_1_ce_1.xml.9.func_base;trans_func_ce; +193;DMRTest.at:528;trans vol_1_ce_1.xml scale(\\\$Int16(20:1,2,3,-4),10) vol_1_ce_1.xml.10.func_base;trans_func_ce; +194;DMRTest.at:529;trans vol_1_ce_1.xml scale(\\\$UInt32(20:1,2,3,4),10) vol_1_ce_1.xml.11.func_base;trans_func_ce; +195;DMRTest.at:530;trans vol_1_ce_1.xml scale(\\\$Int32(20:1,2,3,-4),10) vol_1_ce_1.xml.12.func_base;trans_func_ce; +196;DMRTest.at:531;trans vol_1_ce_1.xml scale(\\\$UInt64(20:1,2,3,0xffffffffffffffff),1) vol_1_ce_1.xml.13.func_base;trans_func_ce; +197;DMRTest.at:532;trans vol_1_ce_1.xml scale(\\\$Int64(20:1,2,3,0x7fffffffffffffff),1) vol_1_ce_1.xml.14.func_base;trans_func_ce; +198;DMRTest.at:533;trans vol_1_ce_1.xml scale(\\\$Float32(20:1,2,3,4.55),10) vol_1_ce_1.xml.15.func_base;trans_func_ce; +199;DMRTest.at:534;trans vol_1_ce_1.xml scale(\\\$Float64(20:1,2,3,4.55),10) vol_1_ce_1.xml.16.func_base;trans_func_ce; +200;DMRTest.at:538;trans vol_1_ce_10.xml scale(lat,10) vol_1_ce_10.xml.1.func_base;trans_func_ce; +201;DMRTest.at:539;trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) vol_1_ce_10.xml.2.func_base;trans_func_ce; +202;DMRTest.at:540;trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) lat[10:11][10:11];lon[10:11][10:11] vol_1_ce_10.xml.3.func_base;trans_func_ce; +203;DMRTest.at:547;filter test_simple_7.xml s test_simple_7.xml.f.trans_base;filter; +204;DMRTest.at:549;filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base;filter; +205;DMRTest.at:550;filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base;filter; +206;DMRTest.at:551;filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base;filter; +207;DMRTest.at:552;filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base;filter; +208;DMRTest.at:553;filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base;filter; +209;DMRTest.at:554;filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base;filter; +210;DMRTest.at:555;filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base;filter; +211;DMRTest.at:557;filter test_simple_7.xml s|1024=1024.0 test_simple_7.xml.fa.trans_base;filter; +214;DMRTest.at:561;filter test_simple_7.xml s|s==\\\"Silly test string: 2\\\" test_simple_7.xml.fs1.trans_base;filter; +215;DMRTest.at:562;filter test_simple_7.xml s|s!=\\\"Silly test string: 2\\\" test_simple_7.xml.fs2.trans_base;filter; +216;DMRTest.at:563;filter test_simple_7.xml s|s<\\\"Silly test string: 2\\\" test_simple_7.xml.fs3.trans_base;filter; +217;DMRTest.at:564;filter test_simple_7.xml s|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.fs4.trans_base;filter; +218;DMRTest.at:565;filter test_simple_7.xml s|s>\\\"Silly test string: 2\\\" test_simple_7.xml.fs5.trans_base;filter; +219;DMRTest.at:566;filter test_simple_7.xml s|s>=\\\"Silly test string: 2\\\" test_simple_7.xml.fs6.trans_base;filter; +220;DMRTest.at:567;filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base;filter; +221;DMRTest.at:571;filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base;filter; +222;DMRTest.at:572;filter test_simple_7.xml s{i1}|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.g1.trans_base;filter; +223;DMRTest.at:575;filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base;filter; +224;DMRTest.at:576;filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base;filter; +225;DMRTest.at:577;filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base;filter; +226;DMRTest.at:578;filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base;filter; +227;DMRTest.at:579;filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base;filter; +228;DMRTest.at:586;filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base;filter; +229;DMRTest.at:587;filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base;filter; +230;DMRTest.at:588;filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base;filter; +231;DMRTest.at:590;filter names_with_spaces2.dmr /inst2/\\\"Point Break\\\".x names_with_spaces2.dmr.1.trans_base;filter; +232;DMRTest.at:591;filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base;filter; +233;DMRTest.at:592;filter names_with_spaces2.dmr /inst2/\\\"Point%20Break\\\".x names_with_spaces2.dmr.1.trans_base;filter; +234;DMRTest.at:594;filter names_with_spaces3.dmr /inst2/\\\"New Group\\\"/x names_with_spaces3.dmr.1.trans_base;filter; +235;DMRTest.at:595;filter names_with_spaces3.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base;filter; " # List of the all the test groups. at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'` @@ -1171,7 +1171,7 @@ # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -libdap 3.20.4 test suite: dmr-test test groups: +libdap 3.20.5 test suite: dmr-test test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1212,7 +1212,7 @@ exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (libdap 3.20.4)" && + $as_echo "$as_me (libdap 3.20.5)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1389,11 +1389,11 @@ # Banners and logs. $as_echo "## ----------------------------------- ## -## libdap 3.20.4 test suite: dmr-test. ## +## libdap 3.20.5 test suite: dmr-test. ## ## ----------------------------------- ##" { $as_echo "## ----------------------------------- ## -## libdap 3.20.4 test suite: dmr-test. ## +## libdap 3.20.5 test suite: dmr-test. ## ## ----------------------------------- ##" echo @@ -2237,7 +2237,7 @@ $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [libdap 3.20.4] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [libdap 3.20.5] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may @@ -2252,7 +2252,7 @@ ## Actual tests. ## ## ------------- ## #AT_START_1 -at_fn_group_banner 1 'DMRTest.at:211' \ +at_fn_group_banner 1 'DMRTest.at:230' \ "parse dmr-testsuite/test_simple_1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2268,28 +2268,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:211: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:211" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:230" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:230" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:211: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:211" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:230: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:230" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230" $at_failed && at_fn_log_failure $at_traceon; } @@ -2297,28 +2297,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:211: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:211" +$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:230" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:211: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:211" +$as_echo "$at_srcdir/DMRTest.at:230: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:230" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230" $at_failed && at_fn_log_failure $at_traceon; } @@ -2332,7 +2332,7 @@ read at_status <"$at_status_file" #AT_STOP_1 #AT_START_2 -at_fn_group_banner 2 'DMRTest.at:212' \ +at_fn_group_banner 2 'DMRTest.at:231' \ "parse dmr-testsuite/test_simple_2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2348,28 +2348,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:212: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:212" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:231" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:231" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:212: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:212" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:231: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:231" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231" $at_failed && at_fn_log_failure $at_traceon; } @@ -2377,28 +2377,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:212: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:212" +$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:231" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:212: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:212" +$as_echo "$at_srcdir/DMRTest.at:231: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:231" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231" $at_failed && at_fn_log_failure $at_traceon; } @@ -2412,7 +2412,7 @@ read at_status <"$at_status_file" #AT_STOP_2 #AT_START_3 -at_fn_group_banner 3 'DMRTest.at:213' \ +at_fn_group_banner 3 'DMRTest.at:232' \ "parse dmr-testsuite/test_simple_3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2428,28 +2428,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:213: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:213" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:232" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:232" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:213: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:213" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:232: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:232" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232" $at_failed && at_fn_log_failure $at_traceon; } @@ -2457,28 +2457,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:213: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:213" +$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:232" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:213: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:213" +$as_echo "$at_srcdir/DMRTest.at:232: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:232" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232" $at_failed && at_fn_log_failure $at_traceon; } @@ -2492,7 +2492,7 @@ read at_status <"$at_status_file" #AT_STOP_3 #AT_START_4 -at_fn_group_banner 4 'DMRTest.at:215' \ +at_fn_group_banner 4 'DMRTest.at:234' \ "parse dmr-testsuite/test_simple_3_error_1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2508,28 +2508,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:215: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:215" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:234" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:234" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:215: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:215" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:234: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:234" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234" $at_failed && at_fn_log_failure $at_traceon; } @@ -2537,28 +2537,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:215: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:215" +$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:234" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:215: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:215" +$as_echo "$at_srcdir/DMRTest.at:234: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:234" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234" $at_failed && at_fn_log_failure $at_traceon; } @@ -2572,7 +2572,7 @@ read at_status <"$at_status_file" #AT_STOP_4 #AT_START_5 -at_fn_group_banner 5 'DMRTest.at:216' \ +at_fn_group_banner 5 'DMRTest.at:235' \ "parse dmr-testsuite/test_simple_3_error_2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2588,28 +2588,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:216: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:216" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:235" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:235" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:216: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:216" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:235: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:235" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235" $at_failed && at_fn_log_failure $at_traceon; } @@ -2617,28 +2617,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:216: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:216" +$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:235" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:216: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:216" +$as_echo "$at_srcdir/DMRTest.at:235: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:235" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235" $at_failed && at_fn_log_failure $at_traceon; } @@ -2652,7 +2652,7 @@ read at_status <"$at_status_file" #AT_STOP_5 #AT_START_6 -at_fn_group_banner 6 'DMRTest.at:217' \ +at_fn_group_banner 6 'DMRTest.at:236' \ "parse dmr-testsuite/test_simple_3_error_3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2668,28 +2668,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:217: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:217" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:236" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:236" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:217: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:217" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:236: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:236" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236" $at_failed && at_fn_log_failure $at_traceon; } @@ -2697,28 +2697,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:217: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:217" +$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:236" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:217: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:217" +$as_echo "$at_srcdir/DMRTest.at:236: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:236" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236" $at_failed && at_fn_log_failure $at_traceon; } @@ -2732,7 +2732,7 @@ read at_status <"$at_status_file" #AT_STOP_6 #AT_START_7 -at_fn_group_banner 7 'DMRTest.at:219' \ +at_fn_group_banner 7 'DMRTest.at:238' \ "parse dmr-testsuite/test_simple_4.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2748,28 +2748,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:219: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:219" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:238: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:238" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:238" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:219: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:219" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:238: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:238" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:238" $at_failed && at_fn_log_failure $at_traceon; } @@ -2777,28 +2777,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:219: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:219" +$as_echo "$at_srcdir/DMRTest.at:238: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:238" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:238" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:219: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:219" +$as_echo "$at_srcdir/DMRTest.at:238: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:238" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:238" $at_failed && at_fn_log_failure $at_traceon; } @@ -2812,7 +2812,7 @@ read at_status <"$at_status_file" #AT_STOP_7 #AT_START_8 -at_fn_group_banner 8 'DMRTest.at:220' \ +at_fn_group_banner 8 'DMRTest.at:239' \ "parse dmr-testsuite/test_simple_5.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2828,28 +2828,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:220: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:220" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:239: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:239" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:239" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:220: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:220" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:239: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:239" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239" $at_failed && at_fn_log_failure $at_traceon; } @@ -2857,28 +2857,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:220: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:220" +$as_echo "$at_srcdir/DMRTest.at:239: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:239" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:220: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:220" +$as_echo "$at_srcdir/DMRTest.at:239: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:239" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239" $at_failed && at_fn_log_failure $at_traceon; } @@ -2892,7 +2892,7 @@ read at_status <"$at_status_file" #AT_STOP_8 #AT_START_9 -at_fn_group_banner 9 'DMRTest.at:221' \ +at_fn_group_banner 9 'DMRTest.at:240' \ "parse dmr-testsuite/test_simple_6.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2908,28 +2908,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:221: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:221" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:240: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:240" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:240" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:221: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:221" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:240: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:240" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240" $at_failed && at_fn_log_failure $at_traceon; } @@ -2937,28 +2937,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:221: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:221" +$as_echo "$at_srcdir/DMRTest.at:240: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:240" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:221: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:221" +$as_echo "$at_srcdir/DMRTest.at:240: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:240" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240" $at_failed && at_fn_log_failure $at_traceon; } @@ -2972,7 +2972,7 @@ read at_status <"$at_status_file" #AT_STOP_9 #AT_START_10 -at_fn_group_banner 10 'DMRTest.at:222' \ +at_fn_group_banner 10 'DMRTest.at:241' \ "parse dmr-testsuite/test_simple_7.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -2988,28 +2988,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:222: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:222" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:241: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:241" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:241" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:222: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:222" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:241: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:241" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241" $at_failed && at_fn_log_failure $at_traceon; } @@ -3017,28 +3017,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:222: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:222" +$as_echo "$at_srcdir/DMRTest.at:241: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:241" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:222: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:222" +$as_echo "$at_srcdir/DMRTest.at:241: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:241" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241" $at_failed && at_fn_log_failure $at_traceon; } @@ -3052,7 +3052,7 @@ read at_status <"$at_status_file" #AT_STOP_10 #AT_START_11 -at_fn_group_banner 11 'DMRTest.at:223' \ +at_fn_group_banner 11 'DMRTest.at:242' \ "parse dmr-testsuite/test_simple_8.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3068,28 +3068,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:223: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:223" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:242: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:242" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:242" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:223: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:223" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:242: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:242" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:242" $at_failed && at_fn_log_failure $at_traceon; } @@ -3097,28 +3097,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:223: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:223" +$as_echo "$at_srcdir/DMRTest.at:242: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:242" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:242" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:223: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:223" +$as_echo "$at_srcdir/DMRTest.at:242: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:242" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:242" $at_failed && at_fn_log_failure $at_traceon; } @@ -3132,7 +3132,7 @@ read at_status <"$at_status_file" #AT_STOP_11 #AT_START_12 -at_fn_group_banner 12 'DMRTest.at:224' \ +at_fn_group_banner 12 'DMRTest.at:243' \ "parse dmr-testsuite/test_simple_9.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3148,28 +3148,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:224: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:224" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:243: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:243" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:243" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:224: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:224" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:243: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:243" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:243" $at_failed && at_fn_log_failure $at_traceon; } @@ -3177,28 +3177,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:224: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:224" +$as_echo "$at_srcdir/DMRTest.at:243: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:243" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:243" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:224: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:224" +$as_echo "$at_srcdir/DMRTest.at:243: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:243" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:243" $at_failed && at_fn_log_failure $at_traceon; } @@ -3212,7 +3212,7 @@ read at_status <"$at_status_file" #AT_STOP_12 #AT_START_13 -at_fn_group_banner 13 'DMRTest.at:225' \ +at_fn_group_banner 13 'DMRTest.at:244' \ "parse dmr-testsuite/test_simple_9.1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3228,28 +3228,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:225: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:225" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:244: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:244" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:244" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:225: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:225" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:244: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:244" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:244" $at_failed && at_fn_log_failure $at_traceon; } @@ -3257,28 +3257,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:225: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:225" +$as_echo "$at_srcdir/DMRTest.at:244: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:244" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:244" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:225: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:225" +$as_echo "$at_srcdir/DMRTest.at:244: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:244" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:244" $at_failed && at_fn_log_failure $at_traceon; } @@ -3292,7 +3292,7 @@ read at_status <"$at_status_file" #AT_STOP_13 #AT_START_14 -at_fn_group_banner 14 'DMRTest.at:226' \ +at_fn_group_banner 14 'DMRTest.at:245' \ "parse dmr-testsuite/test_simple_10.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3308,28 +3308,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:226: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:226" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:245: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:245" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:245" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:226: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:226" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:245: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:245" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:245" $at_failed && at_fn_log_failure $at_traceon; } @@ -3337,28 +3337,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:226: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:226" +$as_echo "$at_srcdir/DMRTest.at:245: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:245" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:245" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:226: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:226" +$as_echo "$at_srcdir/DMRTest.at:245: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:245" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:245" $at_failed && at_fn_log_failure $at_traceon; } @@ -3372,7 +3372,7 @@ read at_status <"$at_status_file" #AT_STOP_14 #AT_START_15 -at_fn_group_banner 15 'DMRTest.at:228' \ +at_fn_group_banner 15 'DMRTest.at:247' \ "parse dmr-testsuite/test_array_1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3388,28 +3388,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:228: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:228" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:247: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:247" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:247" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:228: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:228" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:247: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:247" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:247" $at_failed && at_fn_log_failure $at_traceon; } @@ -3417,28 +3417,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:228: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:228" +$as_echo "$at_srcdir/DMRTest.at:247: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:247" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:247" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:228: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:228" +$as_echo "$at_srcdir/DMRTest.at:247: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:247" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:247" $at_failed && at_fn_log_failure $at_traceon; } @@ -3452,7 +3452,7 @@ read at_status <"$at_status_file" #AT_STOP_15 #AT_START_16 -at_fn_group_banner 16 'DMRTest.at:229' \ +at_fn_group_banner 16 'DMRTest.at:248' \ "parse dmr-testsuite/test_array_2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3468,28 +3468,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:229: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:229" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:248: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:248" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:248" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:229: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:229" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:248: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:248" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:248" $at_failed && at_fn_log_failure $at_traceon; } @@ -3497,28 +3497,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:229: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:229" +$as_echo "$at_srcdir/DMRTest.at:248: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:248" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:248" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:229: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:229" +$as_echo "$at_srcdir/DMRTest.at:248: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:248" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:248" $at_failed && at_fn_log_failure $at_traceon; } @@ -3532,7 +3532,7 @@ read at_status <"$at_status_file" #AT_STOP_16 #AT_START_17 -at_fn_group_banner 17 'DMRTest.at:230' \ +at_fn_group_banner 17 'DMRTest.at:249' \ "parse dmr-testsuite/test_array_3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3548,28 +3548,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:230" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:249: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:249" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:249" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:230: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:230" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:249: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:249" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:249" $at_failed && at_fn_log_failure $at_traceon; } @@ -3577,28 +3577,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:230" +$as_echo "$at_srcdir/DMRTest.at:249: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:249" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:249" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:230: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:230" +$as_echo "$at_srcdir/DMRTest.at:249: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:249" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:249" $at_failed && at_fn_log_failure $at_traceon; } @@ -3612,7 +3612,7 @@ read at_status <"$at_status_file" #AT_STOP_17 #AT_START_18 -at_fn_group_banner 18 'DMRTest.at:231' \ +at_fn_group_banner 18 'DMRTest.at:250' \ "parse dmr-testsuite/test_array_4.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3628,28 +3628,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:231" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:250: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:250" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:250" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:231: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:231" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:250: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:250" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:250" $at_failed && at_fn_log_failure $at_traceon; } @@ -3657,28 +3657,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:231" +$as_echo "$at_srcdir/DMRTest.at:250: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:250" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:250" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:231: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:231" +$as_echo "$at_srcdir/DMRTest.at:250: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:250" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:250" $at_failed && at_fn_log_failure $at_traceon; } @@ -3692,7 +3692,7 @@ read at_status <"$at_status_file" #AT_STOP_18 #AT_START_19 -at_fn_group_banner 19 'DMRTest.at:232' \ +at_fn_group_banner 19 'DMRTest.at:251' \ "parse dmr-testsuite/test_array_5.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3708,28 +3708,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:232" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:251" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:251" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:232: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:232" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:251: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:251" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251" $at_failed && at_fn_log_failure $at_traceon; } @@ -3737,28 +3737,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:232" +$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:251" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:232: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:232" +$as_echo "$at_srcdir/DMRTest.at:251: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:251" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251" $at_failed && at_fn_log_failure $at_traceon; } @@ -3772,7 +3772,7 @@ read at_status <"$at_status_file" #AT_STOP_19 #AT_START_20 -at_fn_group_banner 20 'DMRTest.at:233' \ +at_fn_group_banner 20 'DMRTest.at:252' \ "parse dmr-testsuite/test_array_6.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3788,28 +3788,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:233: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:233" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:252" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:252" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:233: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:233" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:252: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:252" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252" $at_failed && at_fn_log_failure $at_traceon; } @@ -3817,28 +3817,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:233: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:233" +$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:252" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:233: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:233" +$as_echo "$at_srcdir/DMRTest.at:252: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:252" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252" $at_failed && at_fn_log_failure $at_traceon; } @@ -3852,7 +3852,7 @@ read at_status <"$at_status_file" #AT_STOP_20 #AT_START_21 -at_fn_group_banner 21 'DMRTest.at:234' \ +at_fn_group_banner 21 'DMRTest.at:253' \ "parse dmr-testsuite/test_array_7.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3868,28 +3868,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:234" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:253" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:253" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:234: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:234" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:253: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:253" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253" $at_failed && at_fn_log_failure $at_traceon; } @@ -3897,28 +3897,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:234" +$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:253" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:234: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:234" +$as_echo "$at_srcdir/DMRTest.at:253: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:253" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253" $at_failed && at_fn_log_failure $at_traceon; } @@ -3932,7 +3932,7 @@ read at_status <"$at_status_file" #AT_STOP_21 #AT_START_22 -at_fn_group_banner 22 'DMRTest.at:235' \ +at_fn_group_banner 22 'DMRTest.at:254' \ "parse dmr-testsuite/test_array_8.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -3948,28 +3948,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:235" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:254" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:254" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:235: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:235" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:254: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:254" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254" $at_failed && at_fn_log_failure $at_traceon; } @@ -3977,28 +3977,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:235" +$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:254" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:235: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:235" +$as_echo "$at_srcdir/DMRTest.at:254: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:254" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254" $at_failed && at_fn_log_failure $at_traceon; } @@ -4012,7 +4012,7 @@ read at_status <"$at_status_file" #AT_STOP_22 #AT_START_23 -at_fn_group_banner 23 'DMRTest.at:236' \ +at_fn_group_banner 23 'DMRTest.at:255' \ "parse dmr-testsuite/test_array_10.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4028,28 +4028,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:236" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:255" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:255" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:236: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:236" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:255: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:255" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255" $at_failed && at_fn_log_failure $at_traceon; } @@ -4057,28 +4057,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:236" +$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:255" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:236: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:236" +$as_echo "$at_srcdir/DMRTest.at:255: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:255" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255" $at_failed && at_fn_log_failure $at_traceon; } @@ -4092,7 +4092,7 @@ read at_status <"$at_status_file" #AT_STOP_23 #AT_START_24 -at_fn_group_banner 24 'DMRTest.at:237' \ +at_fn_group_banner 24 'DMRTest.at:256' \ "parse dmr-testsuite/test_array_11.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4108,28 +4108,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:237: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:237" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:256" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:256" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:237: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:237" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:256: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:256" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256" $at_failed && at_fn_log_failure $at_traceon; } @@ -4137,28 +4137,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:237: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:237" +$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:256" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:237: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:237" +$as_echo "$at_srcdir/DMRTest.at:256: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:256" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256" $at_failed && at_fn_log_failure $at_traceon; } @@ -4172,7 +4172,7 @@ read at_status <"$at_status_file" #AT_STOP_24 #AT_START_25 -at_fn_group_banner 25 'DMRTest.at:239' \ +at_fn_group_banner 25 'DMRTest.at:258' \ "parse dmr-testsuite/ignore_foreign_xml_1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4188,28 +4188,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:239: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:239" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:258: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:258" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:258" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:239: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:239" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:258: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:258" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258" $at_failed && at_fn_log_failure $at_traceon; } @@ -4217,28 +4217,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:239: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:239" +$as_echo "$at_srcdir/DMRTest.at:258: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:258" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:239: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:239" +$as_echo "$at_srcdir/DMRTest.at:258: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:258" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258" $at_failed && at_fn_log_failure $at_traceon; } @@ -4252,7 +4252,7 @@ read at_status <"$at_status_file" #AT_STOP_25 #AT_START_26 -at_fn_group_banner 26 'DMRTest.at:240' \ +at_fn_group_banner 26 'DMRTest.at:259' \ "parse dmr-testsuite/ignore_foreign_xml_2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4268,28 +4268,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:240: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:240" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:259" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:259" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:240: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:240" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:259: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:259" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259" $at_failed && at_fn_log_failure $at_traceon; } @@ -4297,28 +4297,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:240: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:240" +$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:259" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:240: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:240" +$as_echo "$at_srcdir/DMRTest.at:259: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:259" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259" $at_failed && at_fn_log_failure $at_traceon; } @@ -4332,7 +4332,7 @@ read at_status <"$at_status_file" #AT_STOP_26 #AT_START_27 -at_fn_group_banner 27 'DMRTest.at:241' \ +at_fn_group_banner 27 'DMRTest.at:260' \ "parse dmr-testsuite/ignore_foreign_xml_3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4348,28 +4348,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:241: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:241" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:260" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:260" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:241: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:241" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:260: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:260" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260" $at_failed && at_fn_log_failure $at_traceon; } @@ -4377,28 +4377,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:241: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:241" +$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:260" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:241: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:241" +$as_echo "$at_srcdir/DMRTest.at:260: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:260" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260" $at_failed && at_fn_log_failure $at_traceon; } @@ -4412,7 +4412,7 @@ read at_status <"$at_status_file" #AT_STOP_27 #AT_START_28 -at_fn_group_banner 28 'DMRTest.at:251' \ +at_fn_group_banner 28 'DMRTest.at:270' \ "trans test_simple_1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4432,29 +4432,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:251" +$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:270" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:270" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:251: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:251" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:270: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:270" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270" $at_failed && at_fn_log_failure $at_traceon; } @@ -4462,28 +4465,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:251" +$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:270" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:251: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:251" +$as_echo "$at_srcdir/DMRTest.at:270: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:270" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270" $at_failed && at_fn_log_failure $at_traceon; } @@ -4498,7 +4501,7 @@ read at_status <"$at_status_file" #AT_STOP_28 #AT_START_29 -at_fn_group_banner 29 'DMRTest.at:252' \ +at_fn_group_banner 29 'DMRTest.at:271' \ "trans test_simple_2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4518,29 +4521,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:252" +$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:271" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:271" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:252: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:252" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:271: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:271" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271" $at_failed && at_fn_log_failure $at_traceon; } @@ -4548,28 +4554,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:252" +$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:271" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:252: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:252" +$as_echo "$at_srcdir/DMRTest.at:271: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:271" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271" $at_failed && at_fn_log_failure $at_traceon; } @@ -4584,7 +4590,7 @@ read at_status <"$at_status_file" #AT_STOP_29 #AT_START_30 -at_fn_group_banner 30 'DMRTest.at:253' \ +at_fn_group_banner 30 'DMRTest.at:272' \ "trans test_simple_3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4604,29 +4610,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:253" +$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:272" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:272" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:253: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:253" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:272: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:272" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272" $at_failed && at_fn_log_failure $at_traceon; } @@ -4634,28 +4643,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:253" +$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:272" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:253: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:253" +$as_echo "$at_srcdir/DMRTest.at:272: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:272" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272" $at_failed && at_fn_log_failure $at_traceon; } @@ -4670,7 +4679,7 @@ read at_status <"$at_status_file" #AT_STOP_30 #AT_START_31 -at_fn_group_banner 31 'DMRTest.at:254' \ +at_fn_group_banner 31 'DMRTest.at:273' \ "trans test_simple_4.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4690,29 +4699,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:254" +$as_echo "$at_srcdir/DMRTest.at:273: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:273" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:273" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:254: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:254" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:273: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:273" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:273" $at_failed && at_fn_log_failure $at_traceon; } @@ -4720,28 +4732,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:254" +$as_echo "$at_srcdir/DMRTest.at:273: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:273" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:273" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:254: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:254" +$as_echo "$at_srcdir/DMRTest.at:273: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:273" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:273" $at_failed && at_fn_log_failure $at_traceon; } @@ -4756,7 +4768,7 @@ read at_status <"$at_status_file" #AT_STOP_31 #AT_START_32 -at_fn_group_banner 32 'DMRTest.at:255' \ +at_fn_group_banner 32 'DMRTest.at:274' \ "trans test_simple_5.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4776,29 +4788,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:255" +$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:274" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:274" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:255: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:255" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:274: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:274" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274" $at_failed && at_fn_log_failure $at_traceon; } @@ -4806,28 +4821,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:255" +$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:274" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:255: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:255" +$as_echo "$at_srcdir/DMRTest.at:274: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:274" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274" $at_failed && at_fn_log_failure $at_traceon; } @@ -4842,7 +4857,7 @@ read at_status <"$at_status_file" #AT_STOP_32 #AT_START_33 -at_fn_group_banner 33 'DMRTest.at:256' \ +at_fn_group_banner 33 'DMRTest.at:275' \ "trans test_simple_6.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4862,29 +4877,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:256" +$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:275" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:275" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:256: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:256" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:275: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:275" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275" $at_failed && at_fn_log_failure $at_traceon; } @@ -4892,28 +4910,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:256" +$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:275" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:256: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:256" +$as_echo "$at_srcdir/DMRTest.at:275: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:275" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275" $at_failed && at_fn_log_failure $at_traceon; } @@ -4928,7 +4946,7 @@ read at_status <"$at_status_file" #AT_STOP_33 #AT_START_34 -at_fn_group_banner 34 'DMRTest.at:257' \ +at_fn_group_banner 34 'DMRTest.at:276' \ "trans test_simple_7.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4948,29 +4966,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:257: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:257" +$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:276" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:276" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:257: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:257" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:276: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:276" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276" $at_failed && at_fn_log_failure $at_traceon; } @@ -4978,28 +4999,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:257: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:257" +$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:276" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:257: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:257" +$as_echo "$at_srcdir/DMRTest.at:276: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:276" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276" $at_failed && at_fn_log_failure $at_traceon; } @@ -5014,7 +5035,7 @@ read at_status <"$at_status_file" #AT_STOP_34 #AT_START_35 -at_fn_group_banner 35 'DMRTest.at:258' \ +at_fn_group_banner 35 'DMRTest.at:277' \ "trans test_simple_8.xml" " " at_xfail=no test "xfail" = "xfail" && at_xfail=yes @@ -5034,29 +5055,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:258: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:258" +$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:277" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:277" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:258: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:258" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:277: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:277" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277" $at_failed && at_fn_log_failure $at_traceon; } @@ -5064,28 +5088,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:258: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:258" +$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:277" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:258: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:258" +$as_echo "$at_srcdir/DMRTest.at:277: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:277" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277" $at_failed && at_fn_log_failure $at_traceon; } @@ -5100,7 +5124,7 @@ read at_status <"$at_status_file" #AT_STOP_35 #AT_START_36 -at_fn_group_banner 36 'DMRTest.at:259' \ +at_fn_group_banner 36 'DMRTest.at:278' \ "trans test_simple_9.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5120,29 +5144,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:259" +$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:278" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:278" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:259: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:259" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:278: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:278" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278" $at_failed && at_fn_log_failure $at_traceon; } @@ -5150,28 +5177,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:259" +$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:278" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:259: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:259" +$as_echo "$at_srcdir/DMRTest.at:278: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:278" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278" $at_failed && at_fn_log_failure $at_traceon; } @@ -5186,7 +5213,7 @@ read at_status <"$at_status_file" #AT_STOP_36 #AT_START_37 -at_fn_group_banner 37 'DMRTest.at:260' \ +at_fn_group_banner 37 'DMRTest.at:279' \ "trans test_simple_9.1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5206,29 +5233,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:260" +$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:279" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:279" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:260: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:260" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:279: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:279" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279" $at_failed && at_fn_log_failure $at_traceon; } @@ -5236,28 +5266,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:260" +$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:279" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:260: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:260" +$as_echo "$at_srcdir/DMRTest.at:279: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:279" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279" $at_failed && at_fn_log_failure $at_traceon; } @@ -5272,7 +5302,7 @@ read at_status <"$at_status_file" #AT_STOP_37 #AT_START_38 -at_fn_group_banner 38 'DMRTest.at:261' \ +at_fn_group_banner 38 'DMRTest.at:280' \ "trans test_simple_10.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5292,29 +5322,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:261: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:261" +$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:280" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:280" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:261: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:261" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:280: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:280" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280" $at_failed && at_fn_log_failure $at_traceon; } @@ -5322,28 +5355,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:261: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:261" +$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:280" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:261: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:261" +$as_echo "$at_srcdir/DMRTest.at:280: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:280" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280" $at_failed && at_fn_log_failure $at_traceon; } @@ -5358,7 +5391,7 @@ read at_status <"$at_status_file" #AT_STOP_38 #AT_START_39 -at_fn_group_banner 39 'DMRTest.at:263' \ +at_fn_group_banner 39 'DMRTest.at:282' \ "trans test_array_1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5378,29 +5411,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:263: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:263" +$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:282" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:282" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:263: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:263" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:282: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:282" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282" $at_failed && at_fn_log_failure $at_traceon; } @@ -5408,28 +5444,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:263: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:263" +$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:282" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:263: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:263" +$as_echo "$at_srcdir/DMRTest.at:282: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:282" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282" $at_failed && at_fn_log_failure $at_traceon; } @@ -5444,7 +5480,7 @@ read at_status <"$at_status_file" #AT_STOP_39 #AT_START_40 -at_fn_group_banner 40 'DMRTest.at:264' \ +at_fn_group_banner 40 'DMRTest.at:283' \ "trans test_array_2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5464,29 +5500,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:264: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:264" +$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:283" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:283" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:264: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:264" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:283: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:283" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283" $at_failed && at_fn_log_failure $at_traceon; } @@ -5494,28 +5533,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:264: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:264" +$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:283" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:264: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:264" +$as_echo "$at_srcdir/DMRTest.at:283: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:283" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283" $at_failed && at_fn_log_failure $at_traceon; } @@ -5530,7 +5569,7 @@ read at_status <"$at_status_file" #AT_STOP_40 #AT_START_41 -at_fn_group_banner 41 'DMRTest.at:265' \ +at_fn_group_banner 41 'DMRTest.at:284' \ "trans test_array_3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5550,29 +5589,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:265: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:265" +$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:284" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:284" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:265: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:265" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:284: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:284" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284" $at_failed && at_fn_log_failure $at_traceon; } @@ -5580,28 +5622,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:265: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:265" +$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:284" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:265: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:265" +$as_echo "$at_srcdir/DMRTest.at:284: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:284" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284" $at_failed && at_fn_log_failure $at_traceon; } @@ -5616,7 +5658,7 @@ read at_status <"$at_status_file" #AT_STOP_41 #AT_START_42 -at_fn_group_banner 42 'DMRTest.at:266' \ +at_fn_group_banner 42 'DMRTest.at:285' \ "trans test_array_4.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5636,29 +5678,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:266: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:266" +$as_echo "$at_srcdir/DMRTest.at:285: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:285" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:285" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:266: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:266" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:285: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:285" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:285" $at_failed && at_fn_log_failure $at_traceon; } @@ -5666,28 +5711,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:266: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:266" +$as_echo "$at_srcdir/DMRTest.at:285: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:285" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:285" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:266: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:266" +$as_echo "$at_srcdir/DMRTest.at:285: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:285" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:285" $at_failed && at_fn_log_failure $at_traceon; } @@ -5702,7 +5747,7 @@ read at_status <"$at_status_file" #AT_STOP_42 #AT_START_43 -at_fn_group_banner 43 'DMRTest.at:267' \ +at_fn_group_banner 43 'DMRTest.at:286' \ "trans test_array_5.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5722,29 +5767,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:267: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:267" +$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:286" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:286" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:267: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:267" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:286: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:286" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286" $at_failed && at_fn_log_failure $at_traceon; } @@ -5752,28 +5800,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:267: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:267" +$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:286" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:267: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:267" +$as_echo "$at_srcdir/DMRTest.at:286: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:286" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286" $at_failed && at_fn_log_failure $at_traceon; } @@ -5788,7 +5836,7 @@ read at_status <"$at_status_file" #AT_STOP_43 #AT_START_44 -at_fn_group_banner 44 'DMRTest.at:268' \ +at_fn_group_banner 44 'DMRTest.at:287' \ "trans test_array_6.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5808,29 +5856,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:268: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:268" +$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:287" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:287" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:268: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:268" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:287: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:287" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287" $at_failed && at_fn_log_failure $at_traceon; } @@ -5838,28 +5889,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:268: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:268" +$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:287" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:268: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:268" +$as_echo "$at_srcdir/DMRTest.at:287: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:287" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287" $at_failed && at_fn_log_failure $at_traceon; } @@ -5874,7 +5925,7 @@ read at_status <"$at_status_file" #AT_STOP_44 #AT_START_45 -at_fn_group_banner 45 'DMRTest.at:269' \ +at_fn_group_banner 45 'DMRTest.at:288' \ "trans test_array_7.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5894,29 +5945,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:269: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:269" +$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:288" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:288" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:269: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:269" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:288: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:288" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288" $at_failed && at_fn_log_failure $at_traceon; } @@ -5924,28 +5978,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:269: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:269" +$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:288" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:269: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:269" +$as_echo "$at_srcdir/DMRTest.at:288: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:288" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288" $at_failed && at_fn_log_failure $at_traceon; } @@ -5960,7 +6014,7 @@ read at_status <"$at_status_file" #AT_STOP_45 #AT_START_46 -at_fn_group_banner 46 'DMRTest.at:270' \ +at_fn_group_banner 46 'DMRTest.at:289' \ "trans test_array_8.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -5980,29 +6034,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:270" +$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:289" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:289" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:270: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:270" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:289: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:289" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289" $at_failed && at_fn_log_failure $at_traceon; } @@ -6010,28 +6067,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:270" +$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:289" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:270: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:270" +$as_echo "$at_srcdir/DMRTest.at:289: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:289" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289" $at_failed && at_fn_log_failure $at_traceon; } @@ -6046,7 +6103,7 @@ read at_status <"$at_status_file" #AT_STOP_46 #AT_START_47 -at_fn_group_banner 47 'DMRTest.at:271' \ +at_fn_group_banner 47 'DMRTest.at:290' \ "trans test_array_10.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6066,29 +6123,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:271" +$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:290" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:290" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:271: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:271" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:290: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:290" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290" $at_failed && at_fn_log_failure $at_traceon; } @@ -6096,28 +6156,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:271" +$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:290" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:271: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:271" +$as_echo "$at_srcdir/DMRTest.at:290: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:290" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290" $at_failed && at_fn_log_failure $at_traceon; } @@ -6132,7 +6192,7 @@ read at_status <"$at_status_file" #AT_STOP_47 #AT_START_48 -at_fn_group_banner 48 'DMRTest.at:272' \ +at_fn_group_banner 48 'DMRTest.at:291' \ "trans test_array_11.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6152,29 +6212,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:272" +$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:291" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:291" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:272: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:272" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:291: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:291" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291" $at_failed && at_fn_log_failure $at_traceon; } @@ -6182,28 +6245,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:272" +$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:291" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:272: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:272" +$as_echo "$at_srcdir/DMRTest.at:291: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:291" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291" $at_failed && at_fn_log_failure $at_traceon; } @@ -6218,7 +6281,7 @@ read at_status <"$at_status_file" #AT_STOP_48 #AT_START_49 -at_fn_group_banner 49 'DMRTest.at:274' \ +at_fn_group_banner 49 'DMRTest.at:293' \ "intern test_simple_1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6237,29 +6300,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:274" +$as_echo "$at_srcdir/DMRTest.at:293: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:293" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:293" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:274: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:274" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:293: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:293" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293" $at_failed && at_fn_log_failure $at_traceon; } @@ -6267,28 +6333,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:274" +$as_echo "$at_srcdir/DMRTest.at:293: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:293" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:274: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:274" +$as_echo "$at_srcdir/DMRTest.at:293: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:293" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293" $at_failed && at_fn_log_failure $at_traceon; } @@ -6303,7 +6369,7 @@ read at_status <"$at_status_file" #AT_STOP_49 #AT_START_50 -at_fn_group_banner 50 'DMRTest.at:275' \ +at_fn_group_banner 50 'DMRTest.at:294' \ "intern test_simple_2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6322,29 +6388,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:275" +$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:294" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:294" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:275: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:275" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:294: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:294" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294" $at_failed && at_fn_log_failure $at_traceon; } @@ -6352,28 +6421,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:275" +$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:294" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:275: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:275" +$as_echo "$at_srcdir/DMRTest.at:294: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:294" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294" $at_failed && at_fn_log_failure $at_traceon; } @@ -6388,7 +6457,7 @@ read at_status <"$at_status_file" #AT_STOP_50 #AT_START_51 -at_fn_group_banner 51 'DMRTest.at:276' \ +at_fn_group_banner 51 'DMRTest.at:295' \ "intern test_simple_3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6407,29 +6476,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:276" +$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:295" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:295" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:276: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:276" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:295: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:295" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295" $at_failed && at_fn_log_failure $at_traceon; } @@ -6437,28 +6509,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:276" +$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:295" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:276: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:276" +$as_echo "$at_srcdir/DMRTest.at:295: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:295" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295" $at_failed && at_fn_log_failure $at_traceon; } @@ -6473,7 +6545,7 @@ read at_status <"$at_status_file" #AT_STOP_51 #AT_START_52 -at_fn_group_banner 52 'DMRTest.at:277' \ +at_fn_group_banner 52 'DMRTest.at:296' \ "intern test_simple_4.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6492,29 +6564,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:277" +$as_echo "$at_srcdir/DMRTest.at:296: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:296" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:296" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:277: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:277" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:296: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:296" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:296" $at_failed && at_fn_log_failure $at_traceon; } @@ -6522,28 +6597,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:277" +$as_echo "$at_srcdir/DMRTest.at:296: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:296" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:296" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:277: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:277" +$as_echo "$at_srcdir/DMRTest.at:296: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:296" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:296" $at_failed && at_fn_log_failure $at_traceon; } @@ -6558,7 +6633,7 @@ read at_status <"$at_status_file" #AT_STOP_52 #AT_START_53 -at_fn_group_banner 53 'DMRTest.at:278' \ +at_fn_group_banner 53 'DMRTest.at:297' \ "intern test_simple_5.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6577,29 +6652,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:278" +$as_echo "$at_srcdir/DMRTest.at:297: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:297" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:297" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:278: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:278" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:297: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:297" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:297" $at_failed && at_fn_log_failure $at_traceon; } @@ -6607,28 +6685,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:278" +$as_echo "$at_srcdir/DMRTest.at:297: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:297" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:297" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:278: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:278" +$as_echo "$at_srcdir/DMRTest.at:297: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:297" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:297" $at_failed && at_fn_log_failure $at_traceon; } @@ -6643,7 +6721,7 @@ read at_status <"$at_status_file" #AT_STOP_53 #AT_START_54 -at_fn_group_banner 54 'DMRTest.at:279' \ +at_fn_group_banner 54 'DMRTest.at:298' \ "intern test_simple_6.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6662,29 +6740,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:279" +$as_echo "$at_srcdir/DMRTest.at:298: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:298" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:298" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:279: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:279" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:298: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:298" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298" $at_failed && at_fn_log_failure $at_traceon; } @@ -6692,28 +6773,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:279" +$as_echo "$at_srcdir/DMRTest.at:298: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:298" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:279: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:279" +$as_echo "$at_srcdir/DMRTest.at:298: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:298" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298" $at_failed && at_fn_log_failure $at_traceon; } @@ -6728,7 +6809,7 @@ read at_status <"$at_status_file" #AT_STOP_54 #AT_START_55 -at_fn_group_banner 55 'DMRTest.at:280' \ +at_fn_group_banner 55 'DMRTest.at:299' \ "intern test_simple_7.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6747,29 +6828,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:280" +$as_echo "$at_srcdir/DMRTest.at:299: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:299" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:299" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:280: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:280" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:299: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:299" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299" $at_failed && at_fn_log_failure $at_traceon; } @@ -6777,28 +6861,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:280" +$as_echo "$at_srcdir/DMRTest.at:299: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:299" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:280: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:280" +$as_echo "$at_srcdir/DMRTest.at:299: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:299" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299" $at_failed && at_fn_log_failure $at_traceon; } @@ -6813,7 +6897,7 @@ read at_status <"$at_status_file" #AT_STOP_55 #AT_START_56 -at_fn_group_banner 56 'DMRTest.at:281' \ +at_fn_group_banner 56 'DMRTest.at:300' \ "intern test_simple_8.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6832,29 +6916,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:281: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:281" +$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:300" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:300" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:281: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:281" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:300: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:300" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300" $at_failed && at_fn_log_failure $at_traceon; } @@ -6862,28 +6949,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:281: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:281" +$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:300" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:281: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:281" +$as_echo "$at_srcdir/DMRTest.at:300: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:300" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300" $at_failed && at_fn_log_failure $at_traceon; } @@ -6898,7 +6985,7 @@ read at_status <"$at_status_file" #AT_STOP_56 #AT_START_57 -at_fn_group_banner 57 'DMRTest.at:282' \ +at_fn_group_banner 57 'DMRTest.at:301' \ "intern test_simple_9.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -6917,29 +7004,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:282" +$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:301" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:301" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:282: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:282" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:301: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:301" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301" $at_failed && at_fn_log_failure $at_traceon; } @@ -6947,28 +7037,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:282" +$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:301" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:282: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:282" +$as_echo "$at_srcdir/DMRTest.at:301: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:301" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301" $at_failed && at_fn_log_failure $at_traceon; } @@ -6983,7 +7073,7 @@ read at_status <"$at_status_file" #AT_STOP_57 #AT_START_58 -at_fn_group_banner 58 'DMRTest.at:283' \ +at_fn_group_banner 58 'DMRTest.at:302' \ "intern test_simple_9.1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7002,29 +7092,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:283" +$as_echo "$at_srcdir/DMRTest.at:302: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:302" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:302" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:283: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:283" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:302: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:302" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:302" $at_failed && at_fn_log_failure $at_traceon; } @@ -7032,28 +7125,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:283" +$as_echo "$at_srcdir/DMRTest.at:302: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:302" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:302" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:283: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:283" +$as_echo "$at_srcdir/DMRTest.at:302: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:302" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:302" $at_failed && at_fn_log_failure $at_traceon; } @@ -7068,7 +7161,7 @@ read at_status <"$at_status_file" #AT_STOP_58 #AT_START_59 -at_fn_group_banner 59 'DMRTest.at:284' \ +at_fn_group_banner 59 'DMRTest.at:303' \ "intern test_simple_10.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7087,29 +7180,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:284" +$as_echo "$at_srcdir/DMRTest.at:303: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:303" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:303" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:284: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:284" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:303: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:303" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:303" $at_failed && at_fn_log_failure $at_traceon; } @@ -7117,28 +7213,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:284" +$as_echo "$at_srcdir/DMRTest.at:303: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:303" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:303" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:284: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:284" +$as_echo "$at_srcdir/DMRTest.at:303: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:303" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:303" $at_failed && at_fn_log_failure $at_traceon; } @@ -7153,7 +7249,7 @@ read at_status <"$at_status_file" #AT_STOP_59 #AT_START_60 -at_fn_group_banner 60 'DMRTest.at:286' \ +at_fn_group_banner 60 'DMRTest.at:305' \ "intern test_array_1.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7172,29 +7268,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:286" +$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:305" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:305" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:286: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:286" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:305: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:305" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305" $at_failed && at_fn_log_failure $at_traceon; } @@ -7202,28 +7301,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:286" +$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:305" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:286: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:286" +$as_echo "$at_srcdir/DMRTest.at:305: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:305" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305" $at_failed && at_fn_log_failure $at_traceon; } @@ -7238,7 +7337,7 @@ read at_status <"$at_status_file" #AT_STOP_60 #AT_START_61 -at_fn_group_banner 61 'DMRTest.at:287' \ +at_fn_group_banner 61 'DMRTest.at:306' \ "intern test_array_2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7257,29 +7356,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:287" +$as_echo "$at_srcdir/DMRTest.at:306: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:306" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:306" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:287: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:287" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:306: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:306" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:306" $at_failed && at_fn_log_failure $at_traceon; } @@ -7287,28 +7389,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:287" +$as_echo "$at_srcdir/DMRTest.at:306: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:306" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:306" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:287: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:287" +$as_echo "$at_srcdir/DMRTest.at:306: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:306" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:306" $at_failed && at_fn_log_failure $at_traceon; } @@ -7323,7 +7425,7 @@ read at_status <"$at_status_file" #AT_STOP_61 #AT_START_62 -at_fn_group_banner 62 'DMRTest.at:288' \ +at_fn_group_banner 62 'DMRTest.at:307' \ "intern test_array_3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7342,29 +7444,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:288" +$as_echo "$at_srcdir/DMRTest.at:307: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:307" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:307" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:288: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:288" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:307: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:307" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307" $at_failed && at_fn_log_failure $at_traceon; } @@ -7372,28 +7477,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:288" +$as_echo "$at_srcdir/DMRTest.at:307: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:307" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:288: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:288" +$as_echo "$at_srcdir/DMRTest.at:307: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:307" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307" $at_failed && at_fn_log_failure $at_traceon; } @@ -7408,7 +7513,7 @@ read at_status <"$at_status_file" #AT_STOP_62 #AT_START_63 -at_fn_group_banner 63 'DMRTest.at:289' \ +at_fn_group_banner 63 'DMRTest.at:308' \ "intern test_array_4.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7427,29 +7532,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:289" +$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:308" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:308" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:289: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:289" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:308: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:308" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308" $at_failed && at_fn_log_failure $at_traceon; } @@ -7457,28 +7565,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:289" +$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:308" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:289: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:289" +$as_echo "$at_srcdir/DMRTest.at:308: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:308" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308" $at_failed && at_fn_log_failure $at_traceon; } @@ -7493,7 +7601,7 @@ read at_status <"$at_status_file" #AT_STOP_63 #AT_START_64 -at_fn_group_banner 64 'DMRTest.at:290' \ +at_fn_group_banner 64 'DMRTest.at:309' \ "intern test_array_5.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7512,29 +7620,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:290" +$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:309" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:309" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:290: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:290" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:309: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:309" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309" $at_failed && at_fn_log_failure $at_traceon; } @@ -7542,28 +7653,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:290" +$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:309" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:290: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:290" +$as_echo "$at_srcdir/DMRTest.at:309: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:309" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309" $at_failed && at_fn_log_failure $at_traceon; } @@ -7578,7 +7689,7 @@ read at_status <"$at_status_file" #AT_STOP_64 #AT_START_65 -at_fn_group_banner 65 'DMRTest.at:291' \ +at_fn_group_banner 65 'DMRTest.at:310' \ "intern test_array_6.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7597,29 +7708,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:291" +$as_echo "$at_srcdir/DMRTest.at:310: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:310" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:310" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:291: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:291" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:310: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:310" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310" $at_failed && at_fn_log_failure $at_traceon; } @@ -7627,28 +7741,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:291" +$as_echo "$at_srcdir/DMRTest.at:310: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:310" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:291: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:291" +$as_echo "$at_srcdir/DMRTest.at:310: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:310" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310" $at_failed && at_fn_log_failure $at_traceon; } @@ -7663,7 +7777,7 @@ read at_status <"$at_status_file" #AT_STOP_65 #AT_START_66 -at_fn_group_banner 66 'DMRTest.at:292' \ +at_fn_group_banner 66 'DMRTest.at:311' \ "intern test_array_7.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7682,29 +7796,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:292: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:292" +$as_echo "$at_srcdir/DMRTest.at:311: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:311" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:311" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:292: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:292" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:311: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:311" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:311" $at_failed && at_fn_log_failure $at_traceon; } @@ -7712,28 +7829,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:292: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:292" +$as_echo "$at_srcdir/DMRTest.at:311: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:311" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:311" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:292: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:292" +$as_echo "$at_srcdir/DMRTest.at:311: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:311" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:311" $at_failed && at_fn_log_failure $at_traceon; } @@ -7748,7 +7865,7 @@ read at_status <"$at_status_file" #AT_STOP_66 #AT_START_67 -at_fn_group_banner 67 'DMRTest.at:293' \ +at_fn_group_banner 67 'DMRTest.at:312' \ "intern test_array_8.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7767,29 +7884,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:293: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:293" +$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:312" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:312" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:293: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:293" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:312: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:312" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312" $at_failed && at_fn_log_failure $at_traceon; } @@ -7797,28 +7917,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:293: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:293" +$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:312" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:293: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:293" +$as_echo "$at_srcdir/DMRTest.at:312: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:312" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312" $at_failed && at_fn_log_failure $at_traceon; } @@ -7833,7 +7953,7 @@ read at_status <"$at_status_file" #AT_STOP_67 #AT_START_68 -at_fn_group_banner 68 'DMRTest.at:294' \ +at_fn_group_banner 68 'DMRTest.at:313' \ "intern test_array_10.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7852,29 +7972,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:294" +$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:313" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:313" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:294: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:294" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:313: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:313" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313" $at_failed && at_fn_log_failure $at_traceon; } @@ -7882,28 +8005,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:294" +$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:313" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:294: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:294" +$as_echo "$at_srcdir/DMRTest.at:313: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:313" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313" $at_failed && at_fn_log_failure $at_traceon; } @@ -7918,7 +8041,7 @@ read at_status <"$at_status_file" #AT_STOP_68 #AT_START_69 -at_fn_group_banner 69 'DMRTest.at:295' \ +at_fn_group_banner 69 'DMRTest.at:314' \ "intern test_array_11.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -7937,29 +8060,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:295" +$as_echo "$at_srcdir/DMRTest.at:314: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:314" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:314" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:295: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:295" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:314: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:314" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:314" $at_failed && at_fn_log_failure $at_traceon; } @@ -7967,28 +8093,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:295" +$as_echo "$at_srcdir/DMRTest.at:314: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:314" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:314" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:295: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:295" +$as_echo "$at_srcdir/DMRTest.at:314: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:314" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:314" $at_failed && at_fn_log_failure $at_traceon; } @@ -8003,7 +8129,7 @@ read at_status <"$at_status_file" #AT_STOP_69 #AT_START_70 -at_fn_group_banner 70 'DMRTest.at:298' \ +at_fn_group_banner 70 'DMRTest.at:317' \ "parse dmr-testsuite/test_array_9.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8019,28 +8145,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:298: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:298" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:317" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:317" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:298: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:298" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:317: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:317" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317" $at_failed && at_fn_log_failure $at_traceon; } @@ -8048,28 +8174,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:298: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:298" +$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:317" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:298: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:298" +$as_echo "$at_srcdir/DMRTest.at:317: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:317" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317" $at_failed && at_fn_log_failure $at_traceon; } @@ -8083,7 +8209,7 @@ read at_status <"$at_status_file" #AT_STOP_70 #AT_START_71 -at_fn_group_banner 71 'DMRTest.at:299' \ +at_fn_group_banner 71 'DMRTest.at:318' \ "parse dmr-testsuite/test_array_12.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8099,28 +8225,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:299: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:299" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:318" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:318" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:299: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:299" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:318: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:318" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318" $at_failed && at_fn_log_failure $at_traceon; } @@ -8128,28 +8254,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:299: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:299" +$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:318" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:299: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:299" +$as_echo "$at_srcdir/DMRTest.at:318: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:318" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318" $at_failed && at_fn_log_failure $at_traceon; } @@ -8163,7 +8289,7 @@ read at_status <"$at_status_file" #AT_STOP_71 #AT_START_72 -at_fn_group_banner 72 'DMRTest.at:300' \ +at_fn_group_banner 72 'DMRTest.at:319' \ "parse dmr-testsuite/test_array_13.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8179,28 +8305,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:300" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:319: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:319" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:319" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:300: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:300" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:319: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:319" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319" $at_failed && at_fn_log_failure $at_traceon; } @@ -8208,28 +8334,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:300" +$as_echo "$at_srcdir/DMRTest.at:319: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:319" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:300: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:300" +$as_echo "$at_srcdir/DMRTest.at:319: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:319" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319" $at_failed && at_fn_log_failure $at_traceon; } @@ -8243,7 +8369,7 @@ read at_status <"$at_status_file" #AT_STOP_72 #AT_START_73 -at_fn_group_banner 73 'DMRTest.at:301' \ +at_fn_group_banner 73 'DMRTest.at:320' \ "parse dmr-testsuite/test_array_14.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8259,28 +8385,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:301" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:320: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:320" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:320" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:301: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:301" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:320: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:320" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:320" $at_failed && at_fn_log_failure $at_traceon; } @@ -8288,28 +8414,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:301" +$as_echo "$at_srcdir/DMRTest.at:320: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:320" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:320" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:301: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:301" +$as_echo "$at_srcdir/DMRTest.at:320: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:320" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:320" $at_failed && at_fn_log_failure $at_traceon; } @@ -8323,7 +8449,7 @@ read at_status <"$at_status_file" #AT_STOP_73 #AT_START_74 -at_fn_group_banner 74 'DMRTest.at:304' \ +at_fn_group_banner 74 'DMRTest.at:323' \ "parse dmr-testsuite/test_simple_6.2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8339,28 +8465,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:304" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:323: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:323" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:323" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:304: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:304" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:323: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:323" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:323" $at_failed && at_fn_log_failure $at_traceon; } @@ -8368,28 +8494,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:304" +$as_echo "$at_srcdir/DMRTest.at:323: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:323" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:323" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:304: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:304" +$as_echo "$at_srcdir/DMRTest.at:323: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:323" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:323" $at_failed && at_fn_log_failure $at_traceon; } @@ -8403,7 +8529,7 @@ read at_status <"$at_status_file" #AT_STOP_74 #AT_START_75 -at_fn_group_banner 75 'DMRTest.at:305' \ +at_fn_group_banner 75 'DMRTest.at:324' \ "parse dmr-testsuite/test_simple_6.3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8419,28 +8545,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:305" -( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true +$as_echo "$at_srcdir/DMRTest.at:324: \$abs_builddir/dmr-test -x -p \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input" "DMRTest.at:324" +( $at_check_trace; $abs_builddir/dmr-test -x -p $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:324" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:305: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:305" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:324: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:324" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324" $at_failed && at_fn_log_failure $at_traceon; } @@ -8448,28 +8574,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -p \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:305" +$as_echo "$at_srcdir/DMRTest.at:324: \$abs_builddir/dmr-test -x -p \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:324" ( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:305: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:305" +$as_echo "$at_srcdir/DMRTest.at:324: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:324" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324" $at_failed && at_fn_log_failure $at_traceon; } @@ -8483,7 +8609,7 @@ read at_status <"$at_status_file" #AT_STOP_75 #AT_START_76 -at_fn_group_banner 76 'DMRTest.at:307' \ +at_fn_group_banner 76 'DMRTest.at:326' \ "trans test_array_9.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8503,29 +8629,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:307: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:307" +$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:326" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:326" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:307: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:307" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:326: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:326" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326" $at_failed && at_fn_log_failure $at_traceon; } @@ -8533,28 +8662,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:307: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:307" +$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:326" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:307: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:307" +$as_echo "$at_srcdir/DMRTest.at:326: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:326" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326" $at_failed && at_fn_log_failure $at_traceon; } @@ -8569,7 +8698,7 @@ read at_status <"$at_status_file" #AT_STOP_76 #AT_START_77 -at_fn_group_banner 77 'DMRTest.at:308' \ +at_fn_group_banner 77 'DMRTest.at:327' \ "trans test_array_12.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8589,29 +8718,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:308" +$as_echo "$at_srcdir/DMRTest.at:327: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:327" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:327" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:308: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:308" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:327: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:327" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327" $at_failed && at_fn_log_failure $at_traceon; } @@ -8619,28 +8751,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:308" +$as_echo "$at_srcdir/DMRTest.at:327: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:327" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:308: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:308" +$as_echo "$at_srcdir/DMRTest.at:327: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:327" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327" $at_failed && at_fn_log_failure $at_traceon; } @@ -8655,7 +8787,7 @@ read at_status <"$at_status_file" #AT_STOP_77 #AT_START_78 -at_fn_group_banner 78 'DMRTest.at:309' \ +at_fn_group_banner 78 'DMRTest.at:328' \ "trans test_array_13.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8675,29 +8807,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:309" +$as_echo "$at_srcdir/DMRTest.at:328: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:328" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:328" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:309: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:309" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:328: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:328" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:328" $at_failed && at_fn_log_failure $at_traceon; } @@ -8705,28 +8840,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:309" +$as_echo "$at_srcdir/DMRTest.at:328: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:328" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:328" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:309: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:309" +$as_echo "$at_srcdir/DMRTest.at:328: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:328" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:328" $at_failed && at_fn_log_failure $at_traceon; } @@ -8741,7 +8876,7 @@ read at_status <"$at_status_file" #AT_STOP_78 #AT_START_79 -at_fn_group_banner 79 'DMRTest.at:310' \ +at_fn_group_banner 79 'DMRTest.at:329' \ "trans test_array_14.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8761,29 +8896,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:310: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:310" +$as_echo "$at_srcdir/DMRTest.at:329: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:329" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:329" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:310: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:310" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:329: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:329" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329" $at_failed && at_fn_log_failure $at_traceon; } @@ -8791,28 +8929,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:310: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:310" +$as_echo "$at_srcdir/DMRTest.at:329: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:329" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:310: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:310" +$as_echo "$at_srcdir/DMRTest.at:329: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:329" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329" $at_failed && at_fn_log_failure $at_traceon; } @@ -8827,7 +8965,7 @@ read at_status <"$at_status_file" #AT_STOP_79 #AT_START_80 -at_fn_group_banner 80 'DMRTest.at:312' \ +at_fn_group_banner 80 'DMRTest.at:331' \ "trans test_simple_6.2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8847,29 +8985,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:312" +$as_echo "$at_srcdir/DMRTest.at:331: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:331" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:331" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:312: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:312" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:331: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:331" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:331" $at_failed && at_fn_log_failure $at_traceon; } @@ -8877,28 +9018,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:312" +$as_echo "$at_srcdir/DMRTest.at:331: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:331" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:331" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:312: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:312" +$as_echo "$at_srcdir/DMRTest.at:331: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:331" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:331" $at_failed && at_fn_log_failure $at_traceon; } @@ -8913,7 +9054,7 @@ read at_status <"$at_status_file" #AT_STOP_80 #AT_START_81 -at_fn_group_banner 81 'DMRTest.at:313' \ +at_fn_group_banner 81 'DMRTest.at:332' \ "trans test_simple_6.3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -8933,29 +9074,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:313" +$as_echo "$at_srcdir/DMRTest.at:332: \$abs_builddir/dmr-test -x -t \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:332" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:332" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:313: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:313" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:332: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:332" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:332" $at_failed && at_fn_log_failure $at_traceon; } @@ -8963,28 +9107,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:313" +$as_echo "$at_srcdir/DMRTest.at:332: \$abs_builddir/dmr-test -x -t \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:332" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:332" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:313: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:313" +$as_echo "$at_srcdir/DMRTest.at:332: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:332" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:332" $at_failed && at_fn_log_failure $at_traceon; } @@ -8999,7 +9143,7 @@ read at_status <"$at_status_file" #AT_STOP_81 #AT_START_82 -at_fn_group_banner 82 'DMRTest.at:316' \ +at_fn_group_banner 82 'DMRTest.at:335' \ "trans test_array_9.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9020,29 +9164,33 @@ if test -n "$baselines" -a x$baselines = xyes; then : echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>" + + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:316: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:316" +$as_echo "$at_srcdir/DMRTest.at:335: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:335" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:335" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:316: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:316" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:335: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:335" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:335" $at_failed && at_fn_log_failure $at_traceon; } @@ -9050,28 +9198,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:316: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:316" +$as_echo "$at_srcdir/DMRTest.at:335: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:335" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:335" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:316: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:316" +$as_echo "$at_srcdir/DMRTest.at:335: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:335" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:335" $at_failed && at_fn_log_failure $at_traceon; } @@ -9086,7 +9234,7 @@ read at_status <"$at_status_file" #AT_STOP_82 #AT_START_83 -at_fn_group_banner 83 'DMRTest.at:317' \ +at_fn_group_banner 83 'DMRTest.at:336' \ "trans test_array_12.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9107,29 +9255,33 @@ if test -n "$baselines" -a x$baselines = xyes; then : echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>" + + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:317" +$as_echo "$at_srcdir/DMRTest.at:336: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:336" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:336" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:317: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:317" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:336: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:336" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:336" $at_failed && at_fn_log_failure $at_traceon; } @@ -9137,28 +9289,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:317" +$as_echo "$at_srcdir/DMRTest.at:336: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:336" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:336" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:317: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:317" +$as_echo "$at_srcdir/DMRTest.at:336: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:336" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:336" $at_failed && at_fn_log_failure $at_traceon; } @@ -9173,7 +9325,7 @@ read at_status <"$at_status_file" #AT_STOP_83 #AT_START_84 -at_fn_group_banner 84 'DMRTest.at:318' \ +at_fn_group_banner 84 'DMRTest.at:337' \ "trans test_array_13.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9194,29 +9346,33 @@ if test -n "$baselines" -a x$baselines = xyes; then : echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>" + + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:318" +$as_echo "$at_srcdir/DMRTest.at:337: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:337" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:337" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:318: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:318" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:337: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:337" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:337" $at_failed && at_fn_log_failure $at_traceon; } @@ -9224,28 +9380,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:318" +$as_echo "$at_srcdir/DMRTest.at:337: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:337" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:337" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:318: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:318" +$as_echo "$at_srcdir/DMRTest.at:337: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:337" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:337" $at_failed && at_fn_log_failure $at_traceon; } @@ -9260,7 +9416,7 @@ read at_status <"$at_status_file" #AT_STOP_84 #AT_START_85 -at_fn_group_banner 85 'DMRTest.at:319' \ +at_fn_group_banner 85 'DMRTest.at:338' \ "trans test_array_14.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9281,29 +9437,33 @@ if test -n "$baselines" -a x$baselines = xyes; then : echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>" + + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:319: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:319" +$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:338" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:338" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:319: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:319" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:338: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:338" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" $at_failed && at_fn_log_failure $at_traceon; } @@ -9311,28 +9471,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:319: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:319" +$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:338" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:319: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:319" +$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:338" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" $at_failed && at_fn_log_failure $at_traceon; } @@ -9347,7 +9507,7 @@ read at_status <"$at_status_file" #AT_STOP_85 #AT_START_86 -at_fn_group_banner 86 'DMRTest.at:321' \ +at_fn_group_banner 86 'DMRTest.at:340' \ "trans test_simple_6.2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9368,29 +9528,33 @@ if test -n "$baselines" -a x$baselines = xyes; then : echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>" + + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:321: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:321" +$as_echo "$at_srcdir/DMRTest.at:340: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:340" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:340" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:321: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:321" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:340: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:340" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:340" $at_failed && at_fn_log_failure $at_traceon; } @@ -9398,28 +9562,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:321: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:321" +$as_echo "$at_srcdir/DMRTest.at:340: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:340" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:340" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:321: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:321" +$as_echo "$at_srcdir/DMRTest.at:340: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:340" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:340" $at_failed && at_fn_log_failure $at_traceon; } @@ -9434,7 +9598,7 @@ read at_status <"$at_status_file" #AT_STOP_86 #AT_START_87 -at_fn_group_banner 87 'DMRTest.at:322' \ +at_fn_group_banner 87 'DMRTest.at:341' \ "trans test_simple_6.3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9455,29 +9619,33 @@ if test -n "$baselines" -a x$baselines = xyes; then : echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>" + + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [0], [stdout], [ignore]) + { set +x -$as_echo "$at_srcdir/DMRTest.at:322: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:322" +$as_echo "$at_srcdir/DMRTest.at:341: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:341" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo stderr:; cat "$at_stderr" +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:341" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:322: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:322" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:341: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:341" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:341" $at_failed && at_fn_log_failure $at_traceon; } @@ -9485,28 +9653,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:322: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:322" +$as_echo "$at_srcdir/DMRTest.at:341: \$abs_builddir/dmr-test -x -t \$input | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:341" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; cat "$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:341" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:322: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:322" +$as_echo "$at_srcdir/DMRTest.at:341: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:341" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:341" $at_failed && at_fn_log_failure $at_traceon; } @@ -9521,7 +9689,7 @@ read at_status <"$at_status_file" #AT_STOP_87 #AT_START_88 -at_fn_group_banner 88 'DMRTest.at:324' \ +at_fn_group_banner 88 'DMRTest.at:343' \ "intern test_array_9.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9540,29 +9708,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:324: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:324" +$as_echo "$at_srcdir/DMRTest.at:343: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:343" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:343" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:324: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:324" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:343: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:343" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:343" $at_failed && at_fn_log_failure $at_traceon; } @@ -9570,28 +9741,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:324: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:324" +$as_echo "$at_srcdir/DMRTest.at:343: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:343" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:343" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:324: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:324" +$as_echo "$at_srcdir/DMRTest.at:343: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:343" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:343" $at_failed && at_fn_log_failure $at_traceon; } @@ -9606,7 +9777,7 @@ read at_status <"$at_status_file" #AT_STOP_88 #AT_START_89 -at_fn_group_banner 89 'DMRTest.at:325' \ +at_fn_group_banner 89 'DMRTest.at:344' \ "intern test_array_12.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9625,29 +9796,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:325: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:325" +$as_echo "$at_srcdir/DMRTest.at:344: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:344" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:344" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:325: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:325" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:344: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:344" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:344" $at_failed && at_fn_log_failure $at_traceon; } @@ -9655,28 +9829,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:325: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:325" +$as_echo "$at_srcdir/DMRTest.at:344: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:344" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:344" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:325: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:325" +$as_echo "$at_srcdir/DMRTest.at:344: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:344" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:344" $at_failed && at_fn_log_failure $at_traceon; } @@ -9691,7 +9865,7 @@ read at_status <"$at_status_file" #AT_STOP_89 #AT_START_90 -at_fn_group_banner 90 'DMRTest.at:326' \ +at_fn_group_banner 90 'DMRTest.at:345' \ "intern test_array_13.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9710,29 +9884,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:326" +$as_echo "$at_srcdir/DMRTest.at:345: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:345" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:345" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:326: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:326" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:345: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:345" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:345" $at_failed && at_fn_log_failure $at_traceon; } @@ -9740,28 +9917,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:326" +$as_echo "$at_srcdir/DMRTest.at:345: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:345" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:345" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:326: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:326" +$as_echo "$at_srcdir/DMRTest.at:345: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:345" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:345" $at_failed && at_fn_log_failure $at_traceon; } @@ -9776,7 +9953,7 @@ read at_status <"$at_status_file" #AT_STOP_90 #AT_START_91 -at_fn_group_banner 91 'DMRTest.at:327' \ +at_fn_group_banner 91 'DMRTest.at:346' \ "intern test_array_14.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9795,29 +9972,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:327: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:327" +$as_echo "$at_srcdir/DMRTest.at:346: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:346" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:346" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:327: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:327" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:346: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:346" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346" $at_failed && at_fn_log_failure $at_traceon; } @@ -9825,28 +10005,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:327: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:327" +$as_echo "$at_srcdir/DMRTest.at:346: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:346" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:327: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:327" +$as_echo "$at_srcdir/DMRTest.at:346: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:346" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346" $at_failed && at_fn_log_failure $at_traceon; } @@ -9861,7 +10041,7 @@ read at_status <"$at_status_file" #AT_STOP_91 #AT_START_92 -at_fn_group_banner 92 'DMRTest.at:329' \ +at_fn_group_banner 92 'DMRTest.at:348' \ "intern test_simple_6.2.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9880,29 +10060,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:329: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:329" +$as_echo "$at_srcdir/DMRTest.at:348: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:348" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:348" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:329: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:329" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:348: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:348" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:348" $at_failed && at_fn_log_failure $at_traceon; } @@ -9910,28 +10093,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:329: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:329" +$as_echo "$at_srcdir/DMRTest.at:348: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:348" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:348" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:329: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:329" +$as_echo "$at_srcdir/DMRTest.at:348: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:348" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:348" $at_failed && at_fn_log_failure $at_traceon; } @@ -9946,7 +10129,7 @@ read at_status <"$at_status_file" #AT_STOP_92 #AT_START_93 -at_fn_group_banner 93 'DMRTest.at:330' \ +at_fn_group_banner 93 'DMRTest.at:349' \ "intern test_simple_6.3.xml" " " at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -9965,29 +10148,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:330: \$abs_builddir/dmr-test -x -i \$input" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:330" +$as_echo "$at_srcdir/DMRTest.at:349: \$abs_builddir/dmr-test -x -i \$input" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:349" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:349" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:330: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:330" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:349: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:349" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:349" $at_failed && at_fn_log_failure $at_traceon; } @@ -9995,28 +10181,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:330: \$abs_builddir/dmr-test -x -i \$input || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:330" +$as_echo "$at_srcdir/DMRTest.at:349: \$abs_builddir/dmr-test -x -i \$input || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:349" ( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:349" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:330: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:330" +$as_echo "$at_srcdir/DMRTest.at:349: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:349" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:349" $at_failed && at_fn_log_failure $at_traceon; } @@ -10031,7 +10217,7 @@ read at_status <"$at_status_file" #AT_STOP_93 #AT_START_94 -at_fn_group_banner 94 'DMRTest.at:338' \ +at_fn_group_banner 94 'DMRTest.at:365' \ "trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10047,29 +10233,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "row;x"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row;x\"" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row;x\"" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row;x" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:338" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:365: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:365" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10077,28 +10266,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row;x\" || true" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row;x\" || true" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row;x" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:365" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10112,7 +10301,7 @@ read at_status <"$at_status_file" #AT_STOP_94 #AT_START_95 -at_fn_group_banner 95 'DMRTest.at:338' \ +at_fn_group_banner 95 'DMRTest.at:365' \ "trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10128,29 +10317,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "row=[[2:3]];x"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\"" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\"" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:338" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:365: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:365" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10158,28 +10350,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\" || true" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\" || true" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:365" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10193,7 +10385,7 @@ read at_status <"$at_status_file" #AT_STOP_95 #AT_START_96 -at_fn_group_banner 96 'DMRTest.at:338' \ +at_fn_group_banner 96 'DMRTest.at:365' \ "trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10209,29 +10401,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "row=[[2:3]];x[[0:1]]"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\"" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\"" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:338" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:365: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:365" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10239,28 +10434,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\" || true" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\" || true" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:365" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10274,7 +10469,7 @@ read at_status <"$at_status_file" #AT_STOP_96 #AT_START_97 -at_fn_group_banner 97 'DMRTest.at:338' \ +at_fn_group_banner 97 'DMRTest.at:365' \ "trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10290,29 +10485,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "x[[0:1]]"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\"" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\"" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:338" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:365: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:365" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10320,28 +10518,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\" || true" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\" || true" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:365" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10355,7 +10553,7 @@ read at_status <"$at_status_file" #AT_STOP_97 #AT_START_98 -at_fn_group_banner 98 'DMRTest.at:338' \ +at_fn_group_banner 98 'DMRTest.at:365' \ "trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10371,29 +10569,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "x"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"x\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x\"" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"x\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x\"" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:338" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:365: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:365" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10401,28 +10602,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"x\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x\" || true" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"x\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x\" || true" "DMRTest.at:365" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:338" +$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:365" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:338" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" $at_failed && at_fn_log_failure $at_traceon; } @@ -10436,7 +10637,7 @@ read at_status <"$at_status_file" #AT_STOP_98 #AT_START_99 -at_fn_group_banner 99 'DMRTest.at:350' \ +at_fn_group_banner 99 'DMRTest.at:369' \ "trans ce test_array_4.xml a test_array_4.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10452,29 +10653,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:350: \$abs_builddir/dmr-test -x -t \$input -c \"a\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:350" +$as_echo "$at_srcdir/DMRTest.at:369: \$abs_builddir/dmr-test -x -t \$input -c \"a\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:369" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:369" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:350: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:350" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:369: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:369" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369" $at_failed && at_fn_log_failure $at_traceon; } @@ -10482,28 +10686,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:350: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:350" +$as_echo "$at_srcdir/DMRTest.at:369: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:369" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:350: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:350" +$as_echo "$at_srcdir/DMRTest.at:369: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:369" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369" $at_failed && at_fn_log_failure $at_traceon; } @@ -10517,7 +10721,7 @@ read at_status <"$at_status_file" #AT_STOP_99 #AT_START_100 -at_fn_group_banner 100 'DMRTest.at:351' \ +at_fn_group_banner 100 'DMRTest.at:370' \ "trans ce test_array_4.xml a[][] test_array_4.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10533,29 +10737,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a[[]][[]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:351: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:351" +$as_echo "$at_srcdir/DMRTest.at:370: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:370" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:370" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:351: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:351" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:370: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:370" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370" $at_failed && at_fn_log_failure $at_traceon; } @@ -10563,28 +10770,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:351: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true" "DMRTest.at:351" +$as_echo "$at_srcdir/DMRTest.at:370: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true" "DMRTest.at:370" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:351: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:351" +$as_echo "$at_srcdir/DMRTest.at:370: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:370" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370" $at_failed && at_fn_log_failure $at_traceon; } @@ -10598,7 +10805,7 @@ read at_status <"$at_status_file" #AT_STOP_100 #AT_START_101 -at_fn_group_banner 101 'DMRTest.at:353' \ +at_fn_group_banner 101 'DMRTest.at:372' \ "trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10614,29 +10821,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[0:1]];/col=[[3]];a"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:353: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\"" "DMRTest.at:353" +$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\"" "DMRTest.at:372" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:372" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:353: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:353" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:372: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:372" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372" $at_failed && at_fn_log_failure $at_traceon; } @@ -10644,28 +10854,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:353: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\" || true" "DMRTest.at:353" +$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\" || true" "DMRTest.at:372" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:353: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:353" +$as_echo "$at_srcdir/DMRTest.at:372: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:372" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372" $at_failed && at_fn_log_failure $at_traceon; } @@ -10679,7 +10889,7 @@ read at_status <"$at_status_file" #AT_STOP_101 #AT_START_102 -at_fn_group_banner 102 'DMRTest.at:355' \ +at_fn_group_banner 102 'DMRTest.at:374' \ "trans ce test_array_4.xml /row=[0:1];/col=[3];a[][] test_array_4.xml.4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10695,29 +10905,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[0:1]];/col=[[3]];a[[]][[]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:355: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \"" "DMRTest.at:355" +$as_echo "$at_srcdir/DMRTest.at:374: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \"" "DMRTest.at:374" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:374" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:355: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:355" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:374: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:374" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:374" $at_failed && at_fn_log_failure $at_traceon; } @@ -10725,28 +10938,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:355: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \" || true" "DMRTest.at:355" +$as_echo "$at_srcdir/DMRTest.at:374: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \" || true" "DMRTest.at:374" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:374" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:355: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:355" +$as_echo "$at_srcdir/DMRTest.at:374: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:374" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:374" $at_failed && at_fn_log_failure $at_traceon; } @@ -10760,7 +10973,7 @@ read at_status <"$at_status_file" #AT_STOP_102 #AT_START_103 -at_fn_group_banner 103 'DMRTest.at:357' \ +at_fn_group_banner 103 'DMRTest.at:376' \ "trans ce test_array_4.xml /row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] test_array_4.xml.5.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10776,29 +10989,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[0:1]];/col=[[3]];a[[]][[]];b[[0]][[]];c[[0:]][[0:]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:357: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \"" "DMRTest.at:357" +$as_echo "$at_srcdir/DMRTest.at:376: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \"" "DMRTest.at:376" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:376" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:357: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:357" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:376: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:376" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376" $at_failed && at_fn_log_failure $at_traceon; } @@ -10806,28 +11022,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:357: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true" "DMRTest.at:357" +$as_echo "$at_srcdir/DMRTest.at:376: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true" "DMRTest.at:376" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:357: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:357" +$as_echo "$at_srcdir/DMRTest.at:376: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:376" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376" $at_failed && at_fn_log_failure $at_traceon; } @@ -10841,7 +11057,7 @@ read at_status <"$at_status_file" #AT_STOP_103 #AT_START_104 -at_fn_group_banner 104 'DMRTest.at:359' \ +at_fn_group_banner 104 'DMRTest.at:378' \ "trans ce test_array_4.xml x[][] /test_array_4.xml.6.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10857,29 +11073,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "x[[]][[]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:359: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[][] \"" "DMRTest.at:359" +$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[][] \"" "DMRTest.at:378" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x[][] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:378" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:359: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:359" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:378: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:378" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378" $at_failed && at_fn_log_failure $at_traceon; } @@ -10887,28 +11106,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:359: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[][] \" || true" "DMRTest.at:359" +$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[][] \" || true" "DMRTest.at:378" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x[][] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:359: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:359" +$as_echo "$at_srcdir/DMRTest.at:378: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:378" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378" $at_failed && at_fn_log_failure $at_traceon; } @@ -10922,7 +11141,7 @@ read at_status <"$at_status_file" #AT_STOP_104 #AT_START_105 -at_fn_group_banner 105 'DMRTest.at:360' \ +at_fn_group_banner 105 'DMRTest.at:379' \ "trans ce test_array_4.xml /row=[0:1];x[][] test_array_4.xml.7.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -10938,29 +11157,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[0:1]];x[[]][[]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:360: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \"" "DMRTest.at:360" +$as_echo "$at_srcdir/DMRTest.at:379: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \"" "DMRTest.at:379" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:379" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:360: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:360" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:379: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:379" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:379" $at_failed && at_fn_log_failure $at_traceon; } @@ -10968,28 +11190,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:360: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \" || true" "DMRTest.at:360" +$as_echo "$at_srcdir/DMRTest.at:379: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \" || true" "DMRTest.at:379" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:379" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:360: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:360" +$as_echo "$at_srcdir/DMRTest.at:379: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:379" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:379" $at_failed && at_fn_log_failure $at_traceon; } @@ -11003,7 +11225,7 @@ read at_status <"$at_status_file" #AT_STOP_105 #AT_START_106 -at_fn_group_banner 106 'DMRTest.at:362' \ +at_fn_group_banner 106 'DMRTest.at:381' \ "trans ce test_array_4.xml c[2:][2:] test_array_4.xml.8.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11019,29 +11241,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "c[[2:]][[2:]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:362: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \"" "DMRTest.at:362" +$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \"" "DMRTest.at:381" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:381" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:362: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:362" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:381: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:381" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381" $at_failed && at_fn_log_failure $at_traceon; } @@ -11049,28 +11274,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:362: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \" || true" "DMRTest.at:362" +$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \" || true" "DMRTest.at:381" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:362: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:362" +$as_echo "$at_srcdir/DMRTest.at:381: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:381" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381" $at_failed && at_fn_log_failure $at_traceon; } @@ -11084,7 +11309,7 @@ read at_status <"$at_status_file" #AT_STOP_106 #AT_START_107 -at_fn_group_banner 107 'DMRTest.at:364' \ +at_fn_group_banner 107 'DMRTest.at:383' \ "trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11100,29 +11325,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:364: \$abs_builddir/dmr-test -x -t \$input -c \"s\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:364" +$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"s\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:383" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:383" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:364: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:364" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:383: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:383" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383" $at_failed && at_fn_log_failure $at_traceon; } @@ -11130,28 +11358,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:364: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:364" +$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:383" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:364: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:364" +$as_echo "$at_srcdir/DMRTest.at:383: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:383" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383" $at_failed && at_fn_log_failure $at_traceon; } @@ -11165,7 +11393,7 @@ read at_status <"$at_status_file" #AT_STOP_107 #AT_START_108 -at_fn_group_banner 108 'DMRTest.at:365' \ +at_fn_group_banner 108 'DMRTest.at:384' \ "trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11181,29 +11409,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.i1"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:365" +$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:384" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:384" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:365: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:365" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:384: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:384" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384" $at_failed && at_fn_log_failure $at_traceon; } @@ -11211,28 +11442,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:365" +$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:384" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:365" +$as_echo "$at_srcdir/DMRTest.at:384: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:384" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384" $at_failed && at_fn_log_failure $at_traceon; } @@ -11246,7 +11477,7 @@ read at_status <"$at_status_file" #AT_STOP_108 #AT_START_109 -at_fn_group_banner 109 'DMRTest.at:366' \ +at_fn_group_banner 109 'DMRTest.at:385' \ "trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11262,29 +11493,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.s"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:366: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.s\"" "DMRTest.at:366" +$as_echo "$at_srcdir/DMRTest.at:385: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.s\"" "DMRTest.at:385" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.s" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:385" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:366: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:366" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:385: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:385" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385" $at_failed && at_fn_log_failure $at_traceon; } @@ -11292,28 +11526,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:366: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.s\" || true" "DMRTest.at:366" +$as_echo "$at_srcdir/DMRTest.at:385: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.s\" || true" "DMRTest.at:385" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.s" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:366: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:366" +$as_echo "$at_srcdir/DMRTest.at:385: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:385" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385" $at_failed && at_fn_log_failure $at_traceon; } @@ -11327,7 +11561,7 @@ read at_status <"$at_status_file" #AT_STOP_109 #AT_START_110 -at_fn_group_banner 110 'DMRTest.at:367' \ +at_fn_group_banner 110 'DMRTest.at:386' \ "trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11343,29 +11577,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.inner.i2"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:367: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\"" "DMRTest.at:367" +$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\"" "DMRTest.at:386" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:386" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:367: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:367" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:386: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:386" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386" $at_failed && at_fn_log_failure $at_traceon; } @@ -11373,28 +11610,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:367: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\" || true" "DMRTest.at:367" +$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\" || true" "DMRTest.at:386" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:367: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:367" +$as_echo "$at_srcdir/DMRTest.at:386: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:386" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386" $at_failed && at_fn_log_failure $at_traceon; } @@ -11408,7 +11645,7 @@ read at_status <"$at_status_file" #AT_STOP_110 #AT_START_111 -at_fn_group_banner 111 'DMRTest.at:369' \ +at_fn_group_banner 111 'DMRTest.at:388' \ "trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11424,29 +11661,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:369: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:369" +$as_echo "$at_srcdir/DMRTest.at:388: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:388" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:388" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:369: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:369" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:388: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:388" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388" $at_failed && at_fn_log_failure $at_traceon; } @@ -11454,28 +11694,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:369: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:369" +$as_echo "$at_srcdir/DMRTest.at:388: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:388" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:369: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:369" +$as_echo "$at_srcdir/DMRTest.at:388: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:388" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388" $at_failed && at_fn_log_failure $at_traceon; } @@ -11489,7 +11729,7 @@ read at_status <"$at_status_file" #AT_STOP_111 #AT_START_112 -at_fn_group_banner 112 'DMRTest.at:370' \ +at_fn_group_banner 112 'DMRTest.at:389' \ "trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11505,29 +11745,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{s}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:370: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{s}\"" "DMRTest.at:370" +$as_echo "$at_srcdir/DMRTest.at:389: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{s}\"" "DMRTest.at:389" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{s}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:389" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:370: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:370" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:389: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:389" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:389" $at_failed && at_fn_log_failure $at_traceon; } @@ -11535,28 +11778,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:370: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{s}\" || true" "DMRTest.at:370" +$as_echo "$at_srcdir/DMRTest.at:389: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{s}\" || true" "DMRTest.at:389" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{s}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:389" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:370: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:370" +$as_echo "$at_srcdir/DMRTest.at:389: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:389" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:389" $at_failed && at_fn_log_failure $at_traceon; } @@ -11570,7 +11813,7 @@ read at_status <"$at_status_file" #AT_STOP_112 #AT_START_113 -at_fn_group_banner 113 'DMRTest.at:371' \ +at_fn_group_banner 113 'DMRTest.at:390' \ "trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11586,29 +11829,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{inner.i2}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:371: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\"" "DMRTest.at:371" +$as_echo "$at_srcdir/DMRTest.at:390: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\"" "DMRTest.at:390" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:390" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:371: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:371" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:390: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:390" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390" $at_failed && at_fn_log_failure $at_traceon; } @@ -11616,28 +11862,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:371: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\" || true" "DMRTest.at:371" +$as_echo "$at_srcdir/DMRTest.at:390: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\" || true" "DMRTest.at:390" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:371: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:371" +$as_echo "$at_srcdir/DMRTest.at:390: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:390" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390" $at_failed && at_fn_log_failure $at_traceon; } @@ -11651,7 +11897,7 @@ read at_status <"$at_status_file" #AT_STOP_113 #AT_START_114 -at_fn_group_banner 114 'DMRTest.at:372' \ +at_fn_group_banner 114 'DMRTest.at:391' \ "trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11667,29 +11913,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\"" "DMRTest.at:372" +$as_echo "$at_srcdir/DMRTest.at:391: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\"" "DMRTest.at:391" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:391" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:372: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:372" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:391: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:391" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:391" $at_failed && at_fn_log_failure $at_traceon; } @@ -11697,28 +11946,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\" || true" "DMRTest.at:372" +$as_echo "$at_srcdir/DMRTest.at:391: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\" || true" "DMRTest.at:391" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:391" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:372: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:372" +$as_echo "$at_srcdir/DMRTest.at:391: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:391" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:391" $at_failed && at_fn_log_failure $at_traceon; } @@ -11732,7 +11981,7 @@ read at_status <"$at_status_file" #AT_STOP_114 #AT_START_115 -at_fn_group_banner 115 'DMRTest.at:375' \ +at_fn_group_banner 115 'DMRTest.at:394' \ "trans ce test_array_6.xml a test_array_6.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11748,29 +11997,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:375: \$abs_builddir/dmr-test -x -t \$input -c \"a\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:375" +$as_echo "$at_srcdir/DMRTest.at:394: \$abs_builddir/dmr-test -x -t \$input -c \"a\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:394" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:394" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:375: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:375" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:394: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:394" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:394" $at_failed && at_fn_log_failure $at_traceon; } @@ -11778,28 +12030,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:375: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:375" +$as_echo "$at_srcdir/DMRTest.at:394: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:394" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:394" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:375: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:375" +$as_echo "$at_srcdir/DMRTest.at:394: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:394" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:394" $at_failed && at_fn_log_failure $at_traceon; } @@ -11813,7 +12065,7 @@ read at_status <"$at_status_file" #AT_STOP_115 #AT_START_116 -at_fn_group_banner 116 'DMRTest.at:376' \ +at_fn_group_banner 116 'DMRTest.at:395' \ "trans ce test_array_6.xml a[][] test_array_6.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11829,29 +12081,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a[[]][[]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:376: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:376" +$as_echo "$at_srcdir/DMRTest.at:395: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:395" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:395" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:376: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:376" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:395: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:395" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:395" $at_failed && at_fn_log_failure $at_traceon; } @@ -11859,28 +12114,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:376: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true" "DMRTest.at:376" +$as_echo "$at_srcdir/DMRTest.at:395: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true" "DMRTest.at:395" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:395" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:376: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:376" +$as_echo "$at_srcdir/DMRTest.at:395: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:395" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:395" $at_failed && at_fn_log_failure $at_traceon; } @@ -11894,7 +12149,7 @@ read at_status <"$at_status_file" #AT_STOP_116 #AT_START_117 -at_fn_group_banner 117 'DMRTest.at:377' \ +at_fn_group_banner 117 'DMRTest.at:396' \ "trans ce test_array_6.xml /row=[0:1];a[][] test_array_6.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11910,29 +12165,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[0:1]];a[[]][[]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:377: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \"" "DMRTest.at:377" +$as_echo "$at_srcdir/DMRTest.at:396: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \"" "DMRTest.at:396" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:396" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:377: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:377" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:396: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:396" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396" $at_failed && at_fn_log_failure $at_traceon; } @@ -11940,28 +12198,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:377: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \" || true" "DMRTest.at:377" +$as_echo "$at_srcdir/DMRTest.at:396: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \" || true" "DMRTest.at:396" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:377: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:377" +$as_echo "$at_srcdir/DMRTest.at:396: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:396" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396" $at_failed && at_fn_log_failure $at_traceon; } @@ -11975,7 +12233,7 @@ read at_status <"$at_status_file" #AT_STOP_117 #AT_START_118 -at_fn_group_banner 118 'DMRTest.at:378' \ +at_fn_group_banner 118 'DMRTest.at:397' \ "trans ce test_array_6.xml /row=[0:1];a[][1:2] test_array_6.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -11991,29 +12249,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[0:1]];a[[]][[1:2]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \"" "DMRTest.at:378" +$as_echo "$at_srcdir/DMRTest.at:397: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \"" "DMRTest.at:397" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:397" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:378: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:378" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:397: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:397" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397" $at_failed && at_fn_log_failure $at_traceon; } @@ -12021,28 +12282,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \" || true" "DMRTest.at:378" +$as_echo "$at_srcdir/DMRTest.at:397: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \" || true" "DMRTest.at:397" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:378: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:378" +$as_echo "$at_srcdir/DMRTest.at:397: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:397" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397" $at_failed && at_fn_log_failure $at_traceon; } @@ -12056,7 +12317,7 @@ read at_status <"$at_status_file" #AT_STOP_118 #AT_START_119 -at_fn_group_banner 119 'DMRTest.at:381' \ +at_fn_group_banner 119 'DMRTest.at:400' \ "trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12072,29 +12333,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"a\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:381" +$as_echo "$at_srcdir/DMRTest.at:400: \$abs_builddir/dmr-test -x -t \$input -c \"a\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:400" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:400" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:381: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:381" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:400: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:400" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:400" $at_failed && at_fn_log_failure $at_traceon; } @@ -12102,28 +12366,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:381" +$as_echo "$at_srcdir/DMRTest.at:400: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:400" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:400" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:381: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:381" +$as_echo "$at_srcdir/DMRTest.at:400: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:400" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:400" $at_failed && at_fn_log_failure $at_traceon; } @@ -12137,7 +12401,7 @@ read at_status <"$at_status_file" #AT_STOP_119 #AT_START_120 -at_fn_group_banner 120 'DMRTest.at:382' \ +at_fn_group_banner 120 'DMRTest.at:401' \ "trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12153,29 +12417,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a{i;j}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:382: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\"" "DMRTest.at:382" +$as_echo "$at_srcdir/DMRTest.at:401: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\"" "DMRTest.at:401" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:401" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:382: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:382" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:401: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:401" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:401" $at_failed && at_fn_log_failure $at_traceon; } @@ -12183,28 +12450,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:382: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\" || true" "DMRTest.at:382" +$as_echo "$at_srcdir/DMRTest.at:401: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\" || true" "DMRTest.at:401" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:401" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:382: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:382" +$as_echo "$at_srcdir/DMRTest.at:401: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:401" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:401" $at_failed && at_fn_log_failure $at_traceon; } @@ -12218,7 +12485,7 @@ read at_status <"$at_status_file" #AT_STOP_120 #AT_START_121 -at_fn_group_banner 121 'DMRTest.at:383' \ +at_fn_group_banner 121 'DMRTest.at:402' \ "trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12234,29 +12501,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a.i"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\"" "DMRTest.at:383" +$as_echo "$at_srcdir/DMRTest.at:402: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\"" "DMRTest.at:402" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.i" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:402" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:383: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:383" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:402: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:402" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402" $at_failed && at_fn_log_failure $at_traceon; } @@ -12264,28 +12534,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\" || true" "DMRTest.at:383" +$as_echo "$at_srcdir/DMRTest.at:402: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\" || true" "DMRTest.at:402" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.i" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:383: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:383" +$as_echo "$at_srcdir/DMRTest.at:402: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:402" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402" $at_failed && at_fn_log_failure $at_traceon; } @@ -12299,7 +12569,7 @@ read at_status <"$at_status_file" #AT_STOP_121 #AT_START_122 -at_fn_group_banner 122 'DMRTest.at:384' \ +at_fn_group_banner 122 'DMRTest.at:403' \ "trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12315,29 +12585,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a{i}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\"" "DMRTest.at:384" +$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\"" "DMRTest.at:403" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:403" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:384: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:384" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:403: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:403" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403" $at_failed && at_fn_log_failure $at_traceon; } @@ -12345,28 +12618,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\" || true" "DMRTest.at:384" +$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\" || true" "DMRTest.at:403" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:384: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:384" +$as_echo "$at_srcdir/DMRTest.at:403: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:403" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403" $at_failed && at_fn_log_failure $at_traceon; } @@ -12380,7 +12653,7 @@ read at_status <"$at_status_file" #AT_STOP_122 #AT_START_123 -at_fn_group_banner 123 'DMRTest.at:385' \ +at_fn_group_banner 123 'DMRTest.at:404' \ "trans ce test_array_6.2.xml a.i[0][1:2] test_array_6.2.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12396,29 +12669,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a.i[[0]][[1:2]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:385: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \"" "DMRTest.at:385" +$as_echo "$at_srcdir/DMRTest.at:404: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \"" "DMRTest.at:404" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:404" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:385: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:385" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:404: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:404" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:404" $at_failed && at_fn_log_failure $at_traceon; } @@ -12426,28 +12702,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:385: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \" || true" "DMRTest.at:385" +$as_echo "$at_srcdir/DMRTest.at:404: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \" || true" "DMRTest.at:404" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:404" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:385: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:385" +$as_echo "$at_srcdir/DMRTest.at:404: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:404" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:404" $at_failed && at_fn_log_failure $at_traceon; } @@ -12461,7 +12737,7 @@ read at_status <"$at_status_file" #AT_STOP_123 #AT_START_124 -at_fn_group_banner 124 'DMRTest.at:386' \ +at_fn_group_banner 124 'DMRTest.at:405' \ "trans ce test_array_6.2.xml a{i[0][1:2]} test_array_6.2.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12477,29 +12753,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a{i[[0]][[1:2]]} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \"" "DMRTest.at:386" +$as_echo "$at_srcdir/DMRTest.at:405: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \"" "DMRTest.at:405" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:405" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:386: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:386" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:405: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:405" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:405" $at_failed && at_fn_log_failure $at_traceon; } @@ -12507,28 +12786,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \" || true" "DMRTest.at:386" +$as_echo "$at_srcdir/DMRTest.at:405: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \" || true" "DMRTest.at:405" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:405" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:386: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:386" +$as_echo "$at_srcdir/DMRTest.at:405: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:405" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:405" $at_failed && at_fn_log_failure $at_traceon; } @@ -12542,7 +12821,7 @@ read at_status <"$at_status_file" #AT_STOP_124 #AT_START_125 -at_fn_group_banner 125 'DMRTest.at:387' \ +at_fn_group_banner 125 'DMRTest.at:406' \ "trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2] test_array_6.2.xml.4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12558,29 +12837,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[0:1]];a.i[[]][[1:2]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:387: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \"" "DMRTest.at:387" +$as_echo "$at_srcdir/DMRTest.at:406: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \"" "DMRTest.at:406" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:406" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:387: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:387" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:406: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:406" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:406" $at_failed && at_fn_log_failure $at_traceon; } @@ -12588,28 +12870,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:387: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \" || true" "DMRTest.at:387" +$as_echo "$at_srcdir/DMRTest.at:406: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \" || true" "DMRTest.at:406" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:406" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:387: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:387" +$as_echo "$at_srcdir/DMRTest.at:406: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:406" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:406" $at_failed && at_fn_log_failure $at_traceon; } @@ -12623,7 +12905,7 @@ read at_status <"$at_status_file" #AT_STOP_125 #AT_START_126 -at_fn_group_banner 126 'DMRTest.at:388' \ +at_fn_group_banner 126 'DMRTest.at:407' \ "trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]} test_array_6.2.xml.4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12639,29 +12921,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[0:1]];a{i[[]][[1:2]]} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:388: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \"" "DMRTest.at:388" +$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \"" "DMRTest.at:407" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:407" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:388: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:388" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:407: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:407" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407" $at_failed && at_fn_log_failure $at_traceon; } @@ -12669,28 +12954,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:388: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \" || true" "DMRTest.at:388" +$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \" || true" "DMRTest.at:407" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:388: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:388" +$as_echo "$at_srcdir/DMRTest.at:407: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:407" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407" $at_failed && at_fn_log_failure $at_traceon; } @@ -12704,7 +12989,7 @@ read at_status <"$at_status_file" #AT_STOP_126 #AT_START_127 -at_fn_group_banner 127 'DMRTest.at:390' \ +at_fn_group_banner 127 'DMRTest.at:409' \ "trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12720,29 +13005,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a.j"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:390: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.j\"" "DMRTest.at:390" +$as_echo "$at_srcdir/DMRTest.at:409: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.j\"" "DMRTest.at:409" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.j" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:409" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:390: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:390" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:409: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:409" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:409" $at_failed && at_fn_log_failure $at_traceon; } @@ -12750,28 +13038,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:390: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.j\" || true" "DMRTest.at:390" +$as_echo "$at_srcdir/DMRTest.at:409: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.j\" || true" "DMRTest.at:409" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.j" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:409" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:390: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:390" +$as_echo "$at_srcdir/DMRTest.at:409: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:409" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:409" $at_failed && at_fn_log_failure $at_traceon; } @@ -12785,7 +13073,7 @@ read at_status <"$at_status_file" #AT_STOP_127 #AT_START_128 -at_fn_group_banner 128 'DMRTest.at:393' \ +at_fn_group_banner 128 'DMRTest.at:412' \ "trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12801,29 +13089,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:393: \$abs_builddir/dmr-test -x -t \$input -c \"a\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:393" +$as_echo "$at_srcdir/DMRTest.at:412: \$abs_builddir/dmr-test -x -t \$input -c \"a\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:412" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:412" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:393: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:393" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:412: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:412" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:412" $at_failed && at_fn_log_failure $at_traceon; } @@ -12831,28 +13122,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:393: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:393" +$as_echo "$at_srcdir/DMRTest.at:412: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:412" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:412" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:393: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:393" +$as_echo "$at_srcdir/DMRTest.at:412: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:412" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:412" $at_failed && at_fn_log_failure $at_traceon; } @@ -12866,7 +13157,7 @@ read at_status <"$at_status_file" #AT_STOP_128 #AT_START_129 -at_fn_group_banner 129 'DMRTest.at:396' \ +at_fn_group_banner 129 'DMRTest.at:415' \ "trans ce test_array_6.1.xml /row=[1:2];a[][0] test_array_6.1.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12882,29 +13173,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[1:2]];a[[]][[0]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:396: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \"" "DMRTest.at:396" +$as_echo "$at_srcdir/DMRTest.at:415: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \"" "DMRTest.at:415" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:415" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:396: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:396" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:415: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:415" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:415" $at_failed && at_fn_log_failure $at_traceon; } @@ -12912,28 +13206,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:396: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \" || true" "DMRTest.at:396" +$as_echo "$at_srcdir/DMRTest.at:415: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \" || true" "DMRTest.at:415" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:415" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:396: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:396" +$as_echo "$at_srcdir/DMRTest.at:415: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:415" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:415" $at_failed && at_fn_log_failure $at_traceon; } @@ -12947,7 +13241,7 @@ read at_status <"$at_status_file" #AT_STOP_129 #AT_START_130 -at_fn_group_banner 130 'DMRTest.at:397' \ +at_fn_group_banner 130 'DMRTest.at:416' \ "trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j} test_array_6.1.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -12963,29 +13257,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[1:2]];a[[]][[0]]{i;j} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:397: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \"" "DMRTest.at:397" +$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \"" "DMRTest.at:416" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:416" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:397: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:397" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:416: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:416" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416" $at_failed && at_fn_log_failure $at_traceon; } @@ -12993,28 +13290,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:397: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \" || true" "DMRTest.at:397" +$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \" || true" "DMRTest.at:416" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:397: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:397" +$as_echo "$at_srcdir/DMRTest.at:416: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:416" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416" $at_failed && at_fn_log_failure $at_traceon; } @@ -13028,7 +13325,7 @@ read at_status <"$at_status_file" #AT_STOP_130 #AT_START_131 -at_fn_group_banner 131 'DMRTest.at:399' \ +at_fn_group_banner 131 'DMRTest.at:418' \ "trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j} test_array_6.1.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13044,29 +13341,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "row=[[1:2]];a[[]][[0]]{i;j} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:399: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \"" "DMRTest.at:399" +$as_echo "$at_srcdir/DMRTest.at:418: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \"" "DMRTest.at:418" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:418" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:399: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:399" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:418: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:418" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418" $at_failed && at_fn_log_failure $at_traceon; } @@ -13074,28 +13374,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:399: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \" || true" "DMRTest.at:399" +$as_echo "$at_srcdir/DMRTest.at:418: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \" || true" "DMRTest.at:418" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:399: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:399" +$as_echo "$at_srcdir/DMRTest.at:418: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:418" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418" $at_failed && at_fn_log_failure $at_traceon; } @@ -13109,7 +13409,7 @@ read at_status <"$at_status_file" #AT_STOP_131 #AT_START_132 -at_fn_group_banner 132 'DMRTest.at:402' \ +at_fn_group_banner 132 'DMRTest.at:421' \ "trans ce test_array_6.1.xml a{i[1:2][1:3];j} test_array_6.1.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13125,29 +13425,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a{i[[1:2]][[1:3]];j} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:402: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \"" "DMRTest.at:402" +$as_echo "$at_srcdir/DMRTest.at:421: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \"" "DMRTest.at:421" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:421" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:402: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:402" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:421: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:421" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421" $at_failed && at_fn_log_failure $at_traceon; } @@ -13155,28 +13458,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:402: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \" || true" "DMRTest.at:402" +$as_echo "$at_srcdir/DMRTest.at:421: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \" || true" "DMRTest.at:421" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:402: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:402" +$as_echo "$at_srcdir/DMRTest.at:421: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:421" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421" $at_failed && at_fn_log_failure $at_traceon; } @@ -13190,7 +13493,7 @@ read at_status <"$at_status_file" #AT_STOP_132 #AT_START_133 -at_fn_group_banner 133 'DMRTest.at:403' \ +at_fn_group_banner 133 'DMRTest.at:422' \ "trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j} test_array_6.1.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13206,29 +13509,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "a[[]][[]]{i[[1:2]][[1:3]];j} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \"" "DMRTest.at:403" +$as_echo "$at_srcdir/DMRTest.at:422: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \"" "DMRTest.at:422" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:422" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:403: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:403" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:422: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:422" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:422" $at_failed && at_fn_log_failure $at_traceon; } @@ -13236,28 +13542,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \" || true" "DMRTest.at:403" +$as_echo "$at_srcdir/DMRTest.at:422: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \" || true" "DMRTest.at:422" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:422" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:403: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:403" +$as_echo "$at_srcdir/DMRTest.at:422: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:422" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:422" $at_failed && at_fn_log_failure $at_traceon; } @@ -13271,7 +13577,7 @@ read at_status <"$at_status_file" #AT_STOP_133 #AT_START_134 -at_fn_group_banner 134 'DMRTest.at:407' \ +at_fn_group_banner 134 'DMRTest.at:426' \ "trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]} test_array_6.1.xml.4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13287,29 +13593,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[1]];a[[]][[0]]{i[[]][[0:1]]} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \"" "DMRTest.at:407" +$as_echo "$at_srcdir/DMRTest.at:426: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \"" "DMRTest.at:426" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:426" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:407: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:407" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:426: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:426" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426" $at_failed && at_fn_log_failure $at_traceon; } @@ -13317,28 +13626,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \" || true" "DMRTest.at:407" +$as_echo "$at_srcdir/DMRTest.at:426: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \" || true" "DMRTest.at:426" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:407: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:407" +$as_echo "$at_srcdir/DMRTest.at:426: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:426" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426" $at_failed && at_fn_log_failure $at_traceon; } @@ -13352,7 +13661,7 @@ read at_status <"$at_status_file" #AT_STOP_134 #AT_START_135 -at_fn_group_banner 135 'DMRTest.at:410' \ +at_fn_group_banner 135 'DMRTest.at:429' \ "trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13368,29 +13677,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:410: \$abs_builddir/dmr-test -x -t \$input -c \"s\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:410" +$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"s\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:429" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:429" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:410: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:410" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:429: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:429" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429" $at_failed && at_fn_log_failure $at_traceon; } @@ -13398,28 +13710,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:410: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:410" +$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:429" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:410: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:410" +$as_echo "$at_srcdir/DMRTest.at:429: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:429" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429" $at_failed && at_fn_log_failure $at_traceon; } @@ -13433,7 +13745,7 @@ read at_status <"$at_status_file" #AT_STOP_135 #AT_START_136 -at_fn_group_banner 136 'DMRTest.at:411' \ +at_fn_group_banner 136 'DMRTest.at:430' \ "trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13449,29 +13761,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{i1;s}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:411: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\"" "DMRTest.at:411" +$as_echo "$at_srcdir/DMRTest.at:430: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\"" "DMRTest.at:430" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:430" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:411: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:411" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:430: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:430" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:430" $at_failed && at_fn_log_failure $at_traceon; } @@ -13479,28 +13794,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:411: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true" "DMRTest.at:411" +$as_echo "$at_srcdir/DMRTest.at:430: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true" "DMRTest.at:430" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:430" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:411: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:411" +$as_echo "$at_srcdir/DMRTest.at:430: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:430" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:430" $at_failed && at_fn_log_failure $at_traceon; } @@ -13514,7 +13829,7 @@ read at_status <"$at_status_file" #AT_STOP_136 #AT_START_137 -at_fn_group_banner 137 'DMRTest.at:413' \ +at_fn_group_banner 137 'DMRTest.at:432' \ "trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13530,29 +13845,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.i1"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:413: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:413" +$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:432" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:432" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:413: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:413" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:432: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:432" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432" $at_failed && at_fn_log_failure $at_traceon; } @@ -13560,28 +13878,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:413: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:413" +$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:432" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:413: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:413" +$as_echo "$at_srcdir/DMRTest.at:432: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:432" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432" $at_failed && at_fn_log_failure $at_traceon; } @@ -13595,7 +13913,7 @@ read at_status <"$at_status_file" #AT_STOP_137 #AT_START_138 -at_fn_group_banner 138 'DMRTest.at:414' \ +at_fn_group_banner 138 'DMRTest.at:433' \ "trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13611,29 +13929,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:414: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:414" +$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:433" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:433" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:414: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:414" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:433: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:433" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433" $at_failed && at_fn_log_failure $at_traceon; } @@ -13641,28 +13962,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:414: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:414" +$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:433" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:414: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:414" +$as_echo "$at_srcdir/DMRTest.at:433: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:433" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433" $at_failed && at_fn_log_failure $at_traceon; } @@ -13676,7 +13997,7 @@ read at_status <"$at_status_file" #AT_STOP_138 #AT_START_139 -at_fn_group_banner 139 'DMRTest.at:416' \ +at_fn_group_banner 139 'DMRTest.at:435' \ "trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -13692,29 +14013,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "outer"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"outer\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\"" "DMRTest.at:416" +$as_echo "$at_srcdir/DMRTest.at:435: \$abs_builddir/dmr-test -x -t \$input -c \"outer\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\"" "DMRTest.at:435" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:435" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:416: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:416" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:435: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:435" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:435" $at_failed && at_fn_log_failure $at_traceon; } @@ -13722,28 +14046,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"outer\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\" || true" "DMRTest.at:416" +$as_echo "$at_srcdir/DMRTest.at:435: \$abs_builddir/dmr-test -x -t \$input -c \"outer\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\" || true" "DMRTest.at:435" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:435" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:416: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:416" +$as_echo "$at_srcdir/DMRTest.at:435: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:435" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:435" $at_failed && at_fn_log_failure $at_traceon; } @@ -13757,7 +14081,7 @@ read at_status <"$at_status_file" #AT_STOP_139 #AT_START_140 -at_fn_group_banner 140 'DMRTest.at:417' \ +at_fn_group_banner 140 'DMRTest.at:436' \ "trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -13773,29 +14097,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "outer.s.s"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:417: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\"" "DMRTest.at:417" +$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\"" "DMRTest.at:436" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:436" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:417: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:417" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:436: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:436" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436" $at_failed && at_fn_log_failure $at_traceon; } @@ -13803,28 +14130,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:417: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\" || true" "DMRTest.at:417" +$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\" || true" "DMRTest.at:436" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:417: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:417" +$as_echo "$at_srcdir/DMRTest.at:436: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:436" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436" $at_failed && at_fn_log_failure $at_traceon; } @@ -13838,7 +14165,7 @@ read at_status <"$at_status_file" #AT_STOP_140 #AT_START_141 -at_fn_group_banner 141 'DMRTest.at:418' \ +at_fn_group_banner 141 'DMRTest.at:437' \ "trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -13854,29 +14181,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "outer{s{s}}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:418: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\"" "DMRTest.at:418" +$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\"" "DMRTest.at:437" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:437" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:418: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:418" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:437: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:437" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437" $at_failed && at_fn_log_failure $at_traceon; } @@ -13884,28 +14214,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:418: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\" || true" "DMRTest.at:418" +$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\" || true" "DMRTest.at:437" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:418: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:418" +$as_echo "$at_srcdir/DMRTest.at:437: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:437" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437" $at_failed && at_fn_log_failure $at_traceon; } @@ -13919,7 +14249,7 @@ read at_status <"$at_status_file" #AT_STOP_141 #AT_START_142 -at_fn_group_banner 142 'DMRTest.at:420' \ +at_fn_group_banner 142 'DMRTest.at:439' \ "trans ce test_array_7.xml s test_array_7.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -13935,29 +14265,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:420: \$abs_builddir/dmr-test -x -t \$input -c \"s\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:420" +$as_echo "$at_srcdir/DMRTest.at:439: \$abs_builddir/dmr-test -x -t \$input -c \"s\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:439" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:439" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:420: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:420" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:439: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:439" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439" $at_failed && at_fn_log_failure $at_traceon; } @@ -13965,28 +14298,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:420: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:420" +$as_echo "$at_srcdir/DMRTest.at:439: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:439" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:420: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:420" +$as_echo "$at_srcdir/DMRTest.at:439: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:439" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439" $at_failed && at_fn_log_failure $at_traceon; } @@ -14000,7 +14333,7 @@ read at_status <"$at_status_file" #AT_STOP_142 #AT_START_143 -at_fn_group_banner 143 'DMRTest.at:421' \ +at_fn_group_banner 143 'DMRTest.at:440' \ "trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14016,29 +14349,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{i1;s}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:421: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\"" "DMRTest.at:421" +$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\"" "DMRTest.at:440" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:440" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:421: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:421" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:440: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:440" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440" $at_failed && at_fn_log_failure $at_traceon; } @@ -14046,28 +14382,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:421: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true" "DMRTest.at:421" +$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true" "DMRTest.at:440" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:421: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:421" +$as_echo "$at_srcdir/DMRTest.at:440: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:440" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440" $at_failed && at_fn_log_failure $at_traceon; } @@ -14081,7 +14417,7 @@ read at_status <"$at_status_file" #AT_STOP_143 #AT_START_144 -at_fn_group_banner 144 'DMRTest.at:423' \ +at_fn_group_banner 144 'DMRTest.at:442' \ "trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14097,29 +14433,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.i1"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:423: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:423" +$as_echo "$at_srcdir/DMRTest.at:442: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:442" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:442" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:423: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:423" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:442: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:442" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442" $at_failed && at_fn_log_failure $at_traceon; } @@ -14127,28 +14466,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:423: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:423" +$as_echo "$at_srcdir/DMRTest.at:442: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:442" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:423: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:423" +$as_echo "$at_srcdir/DMRTest.at:442: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:442" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442" $at_failed && at_fn_log_failure $at_traceon; } @@ -14162,7 +14501,7 @@ read at_status <"$at_status_file" #AT_STOP_144 #AT_START_145 -at_fn_group_banner 145 'DMRTest.at:424' \ +at_fn_group_banner 145 'DMRTest.at:443' \ "trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14178,29 +14517,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:424: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:424" +$as_echo "$at_srcdir/DMRTest.at:443: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:443" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:443" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:424: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:424" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:443: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:443" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:443" $at_failed && at_fn_log_failure $at_traceon; } @@ -14208,28 +14550,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:424: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:424" +$as_echo "$at_srcdir/DMRTest.at:443: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:443" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:443" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:424: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:424" +$as_echo "$at_srcdir/DMRTest.at:443: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:443" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:443" $at_failed && at_fn_log_failure $at_traceon; } @@ -14243,7 +14585,7 @@ read at_status <"$at_status_file" #AT_STOP_145 #AT_START_146 -at_fn_group_banner 146 'DMRTest.at:426' \ +at_fn_group_banner 146 'DMRTest.at:445' \ "trans ce test_array_7.xml s[1] test_array_7.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14259,29 +14601,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s[[1]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:426: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1] \"" "DMRTest.at:426" +$as_echo "$at_srcdir/DMRTest.at:445: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1] \"" "DMRTest.at:445" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:445" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:426: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:426" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:445: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:445" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445" $at_failed && at_fn_log_failure $at_traceon; } @@ -14289,28 +14634,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:426: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1] \" || true" "DMRTest.at:426" +$as_echo "$at_srcdir/DMRTest.at:445: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1] \" || true" "DMRTest.at:445" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:426: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:426" +$as_echo "$at_srcdir/DMRTest.at:445: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:445" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445" $at_failed && at_fn_log_failure $at_traceon; } @@ -14324,7 +14669,7 @@ read at_status <"$at_status_file" #AT_STOP_146 #AT_START_147 -at_fn_group_banner 147 'DMRTest.at:427' \ +at_fn_group_banner 147 'DMRTest.at:446' \ "trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14340,29 +14685,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s[[1]]{i1;s}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:427: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\"" "DMRTest.at:427" +$as_echo "$at_srcdir/DMRTest.at:446: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\"" "DMRTest.at:446" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:446" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:427: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:427" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:446: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:446" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:446" $at_failed && at_fn_log_failure $at_traceon; } @@ -14370,28 +14718,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:427: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\" || true" "DMRTest.at:427" +$as_echo "$at_srcdir/DMRTest.at:446: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\" || true" "DMRTest.at:446" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:446" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:427: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:427" +$as_echo "$at_srcdir/DMRTest.at:446: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:446" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:446" $at_failed && at_fn_log_failure $at_traceon; } @@ -14405,7 +14753,7 @@ read at_status <"$at_status_file" #AT_STOP_147 #AT_START_148 -at_fn_group_banner 148 'DMRTest.at:429' \ +at_fn_group_banner 148 'DMRTest.at:448' \ "trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14421,29 +14769,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s[[1]]{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\"" "DMRTest.at:429" +$as_echo "$at_srcdir/DMRTest.at:448: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\"" "DMRTest.at:448" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:448" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:429: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:429" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:448: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:448" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:448" $at_failed && at_fn_log_failure $at_traceon; } @@ -14451,28 +14802,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\" || true" "DMRTest.at:429" +$as_echo "$at_srcdir/DMRTest.at:448: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\" || true" "DMRTest.at:448" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:448" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:429: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:429" +$as_echo "$at_srcdir/DMRTest.at:448: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:448" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:448" $at_failed && at_fn_log_failure $at_traceon; } @@ -14486,7 +14837,7 @@ read at_status <"$at_status_file" #AT_STOP_148 #AT_START_149 -at_fn_group_banner 149 'DMRTest.at:432' \ +at_fn_group_banner 149 'DMRTest.at:451' \ "trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14502,29 +14853,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s[[1]][[]]{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\"" "DMRTest.at:432" +$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\"" "DMRTest.at:451" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:451" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:432: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:432" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:451: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:451" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451" $at_failed && at_fn_log_failure $at_traceon; } @@ -14532,28 +14886,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\" || true" "DMRTest.at:432" +$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\" || true" "DMRTest.at:451" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:432: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:432" +$as_echo "$at_srcdir/DMRTest.at:451: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:451" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451" $at_failed && at_fn_log_failure $at_traceon; } @@ -14567,7 +14921,7 @@ read at_status <"$at_status_file" #AT_STOP_149 #AT_START_150 -at_fn_group_banner 150 'DMRTest.at:433' \ +at_fn_group_banner 150 'DMRTest.at:452' \ "trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14583,29 +14937,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "col=[[1:2]];s[[1]][[]]{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\"" "DMRTest.at:433" +$as_echo "$at_srcdir/DMRTest.at:452: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\"" "DMRTest.at:452" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:452" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:433: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:433" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:452: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:452" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:452" $at_failed && at_fn_log_failure $at_traceon; } @@ -14613,28 +14970,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\" || true" "DMRTest.at:433" +$as_echo "$at_srcdir/DMRTest.at:452: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\" || true" "DMRTest.at:452" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:452" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:433: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:433" +$as_echo "$at_srcdir/DMRTest.at:452: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:452" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:452" $at_failed && at_fn_log_failure $at_traceon; } @@ -14648,7 +15005,7 @@ read at_status <"$at_status_file" #AT_STOP_150 #AT_START_151 -at_fn_group_banner 151 'DMRTest.at:436' \ +at_fn_group_banner 151 'DMRTest.at:455' \ "trans ce test_array_7.1.xml test_array_7.1.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14664,29 +15021,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c ""], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\"" "DMRTest.at:436" +$as_echo "$at_srcdir/DMRTest.at:455: \$abs_builddir/dmr-test -x -t \$input -c \"\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\"" "DMRTest.at:455" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:455" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:436: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:436" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:455: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:455" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455" $at_failed && at_fn_log_failure $at_traceon; } @@ -14694,28 +15054,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\" || true" "DMRTest.at:436" +$as_echo "$at_srcdir/DMRTest.at:455: \$abs_builddir/dmr-test -x -t \$input -c \"\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\" || true" "DMRTest.at:455" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:436: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:436" +$as_echo "$at_srcdir/DMRTest.at:455: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:455" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455" $at_failed && at_fn_log_failure $at_traceon; } @@ -14729,7 +15089,7 @@ read at_status <"$at_status_file" #AT_STOP_151 #AT_START_152 -at_fn_group_banner 152 'DMRTest.at:437' \ +at_fn_group_banner 152 'DMRTest.at:456' \ "trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14745,29 +15105,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"s\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:437" +$as_echo "$at_srcdir/DMRTest.at:456: \$abs_builddir/dmr-test -x -t \$input -c \"s\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:456" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:456" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:437: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:437" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:456: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:456" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456" $at_failed && at_fn_log_failure $at_traceon; } @@ -14775,28 +15138,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:437" +$as_echo "$at_srcdir/DMRTest.at:456: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:456" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:437: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:437" +$as_echo "$at_srcdir/DMRTest.at:456: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:456" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456" $at_failed && at_fn_log_failure $at_traceon; } @@ -14810,7 +15173,7 @@ read at_status <"$at_status_file" #AT_STOP_152 #AT_START_153 -at_fn_group_banner 153 'DMRTest.at:439' \ +at_fn_group_banner 153 'DMRTest.at:458' \ "trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14826,29 +15189,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.i1"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:439: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:439" +$as_echo "$at_srcdir/DMRTest.at:458: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:458" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:458" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:439: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:439" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:458: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:458" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:458" $at_failed && at_fn_log_failure $at_traceon; } @@ -14856,28 +15222,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:439: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:439" +$as_echo "$at_srcdir/DMRTest.at:458: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:458" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:458" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:439: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:439" +$as_echo "$at_srcdir/DMRTest.at:458: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:458" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:458" $at_failed && at_fn_log_failure $at_traceon; } @@ -14891,7 +15257,7 @@ read at_status <"$at_status_file" #AT_STOP_153 #AT_START_154 -at_fn_group_banner 154 'DMRTest.at:440' \ +at_fn_group_banner 154 'DMRTest.at:459' \ "trans ce test_array_7.1.xml s.i1[][] test_array_7.1.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14907,29 +15273,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.i1[[]][[]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \"" "DMRTest.at:440" +$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \"" "DMRTest.at:459" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:459" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:440: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:440" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:459: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:459" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459" $at_failed && at_fn_log_failure $at_traceon; } @@ -14937,28 +15306,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \" || true" "DMRTest.at:440" +$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \" || true" "DMRTest.at:459" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:440: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:440" +$as_echo "$at_srcdir/DMRTest.at:459: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:459" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459" $at_failed && at_fn_log_failure $at_traceon; } @@ -14972,7 +15341,7 @@ read at_status <"$at_status_file" #AT_STOP_154 #AT_START_155 -at_fn_group_banner 155 'DMRTest.at:441' \ +at_fn_group_banner 155 'DMRTest.at:460' \ "trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -14988,29 +15357,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:441: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:441" +$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:460" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:460" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:441: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:441" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:460: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:460" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460" $at_failed && at_fn_log_failure $at_traceon; } @@ -15018,28 +15390,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:441: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:441" +$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:460" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:441: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:441" +$as_echo "$at_srcdir/DMRTest.at:460: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:460" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460" $at_failed && at_fn_log_failure $at_traceon; } @@ -15053,7 +15425,7 @@ read at_status <"$at_status_file" #AT_STOP_155 #AT_START_156 -at_fn_group_banner 156 'DMRTest.at:442' \ +at_fn_group_banner 156 'DMRTest.at:461' \ "trans ce test_array_7.1.xml s{i1[][]} test_array_7.1.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15069,29 +15441,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{i1[[]][[]]} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:442: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \"" "DMRTest.at:442" +$as_echo "$at_srcdir/DMRTest.at:461: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \"" "DMRTest.at:461" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:461" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:442: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:442" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:461: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:461" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461" $at_failed && at_fn_log_failure $at_traceon; } @@ -15099,28 +15474,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:442: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \" || true" "DMRTest.at:442" +$as_echo "$at_srcdir/DMRTest.at:461: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \" || true" "DMRTest.at:461" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:442: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:442" +$as_echo "$at_srcdir/DMRTest.at:461: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:461" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461" $at_failed && at_fn_log_failure $at_traceon; } @@ -15134,7 +15509,7 @@ read at_status <"$at_status_file" #AT_STOP_156 #AT_START_157 -at_fn_group_banner 157 'DMRTest.at:444' \ +at_fn_group_banner 157 'DMRTest.at:463' \ "trans ce test_array_7.1.xml s.i1[0][0] test_array_7.1.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15150,29 +15525,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.i1[[0]][[0]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:444: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \"" "DMRTest.at:444" +$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \"" "DMRTest.at:463" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:463" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:444: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:444" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:463: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:463" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463" $at_failed && at_fn_log_failure $at_traceon; } @@ -15180,28 +15558,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:444: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \" || true" "DMRTest.at:444" +$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \" || true" "DMRTest.at:463" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:444: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:444" +$as_echo "$at_srcdir/DMRTest.at:463: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:463" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463" $at_failed && at_fn_log_failure $at_traceon; } @@ -15215,7 +15593,7 @@ read at_status <"$at_status_file" #AT_STOP_157 #AT_START_158 -at_fn_group_banner 158 'DMRTest.at:445' \ +at_fn_group_banner 158 'DMRTest.at:464' \ "trans ce test_array_7.1.xml s{i1[0][0]} test_array_7.1.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15231,29 +15609,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s{i1[[0]][[0]]} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:445: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \"" "DMRTest.at:445" +$as_echo "$at_srcdir/DMRTest.at:464: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \"" "DMRTest.at:464" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:464" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:445: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:445" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:464: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:464" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464" $at_failed && at_fn_log_failure $at_traceon; } @@ -15261,28 +15642,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:445: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \" || true" "DMRTest.at:445" +$as_echo "$at_srcdir/DMRTest.at:464: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \" || true" "DMRTest.at:464" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:445: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:445" +$as_echo "$at_srcdir/DMRTest.at:464: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:464" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464" $at_failed && at_fn_log_failure $at_traceon; } @@ -15296,7 +15677,7 @@ read at_status <"$at_status_file" #AT_STOP_158 #AT_START_159 -at_fn_group_banner 159 'DMRTest.at:447' \ +at_fn_group_banner 159 'DMRTest.at:466' \ "trans ce test_array_7.1.xml s.i1[0:2][1:2] test_array_7.1.xml.4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15312,29 +15693,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "s.i1[[0:2]][[1:2]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:447: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \"" "DMRTest.at:447" +$as_echo "$at_srcdir/DMRTest.at:466: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \"" "DMRTest.at:466" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:466" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:447: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:447" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:466: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:466" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466" $at_failed && at_fn_log_failure $at_traceon; } @@ -15342,28 +15726,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:447: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \" || true" "DMRTest.at:447" +$as_echo "$at_srcdir/DMRTest.at:466: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \" || true" "DMRTest.at:466" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:447: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:447" +$as_echo "$at_srcdir/DMRTest.at:466: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:466" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466" $at_failed && at_fn_log_failure $at_traceon; } @@ -15377,7 +15761,7 @@ read at_status <"$at_status_file" #AT_STOP_159 #AT_START_160 -at_fn_group_banner 160 'DMRTest.at:451' \ +at_fn_group_banner 160 'DMRTest.at:470' \ "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s test_array_7.1.xml.5.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15393,29 +15777,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[2:3]];/col=[[2:3]];s "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \"" "DMRTest.at:451" +$as_echo "$at_srcdir/DMRTest.at:470: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \"" "DMRTest.at:470" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:470" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:451: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:451" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:470: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:470" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:470" $at_failed && at_fn_log_failure $at_traceon; } @@ -15423,28 +15810,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \" || true" "DMRTest.at:451" +$as_echo "$at_srcdir/DMRTest.at:470: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \" || true" "DMRTest.at:470" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:470" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:451: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:451" +$as_echo "$at_srcdir/DMRTest.at:470: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:470" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:470" $at_failed && at_fn_log_failure $at_traceon; } @@ -15458,7 +15845,7 @@ read at_status <"$at_status_file" #AT_STOP_160 #AT_START_161 -at_fn_group_banner 161 'DMRTest.at:453' \ +at_fn_group_banner 161 'DMRTest.at:472' \ "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1 test_array_7.1.xml.6.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15474,29 +15861,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[2:3]];/col=[[2:3]];s.i1 "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:453: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1 \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \"" "DMRTest.at:453" +$as_echo "$at_srcdir/DMRTest.at:472: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1 \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \"" "DMRTest.at:472" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:472" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:453: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:453" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:472: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:472" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:472" $at_failed && at_fn_log_failure $at_traceon; } @@ -15504,28 +15894,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:453: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true" "DMRTest.at:453" +$as_echo "$at_srcdir/DMRTest.at:472: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true" "DMRTest.at:472" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:472" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:453: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:453" +$as_echo "$at_srcdir/DMRTest.at:472: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:472" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:472" $at_failed && at_fn_log_failure $at_traceon; } @@ -15539,7 +15929,7 @@ read at_status <"$at_status_file" #AT_STOP_161 #AT_START_162 -at_fn_group_banner 162 'DMRTest.at:454' \ +at_fn_group_banner 162 'DMRTest.at:473' \ "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][] test_array_7.1.xml.6.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15555,29 +15945,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[2:3]];/col=[[2:3]];s.i1[[]][[]] "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:454: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1[][] \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \"" "DMRTest.at:454" +$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1[][] \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \"" "DMRTest.at:473" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:473" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:454: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:454" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:473: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:473" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473" $at_failed && at_fn_log_failure $at_traceon; } @@ -15585,28 +15978,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:454: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true" "DMRTest.at:454" +$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true" "DMRTest.at:473" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:454: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:454" +$as_echo "$at_srcdir/DMRTest.at:473: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:473" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473" $at_failed && at_fn_log_failure $at_traceon; } @@ -15620,7 +16013,7 @@ read at_status <"$at_status_file" #AT_STOP_162 #AT_START_163 -at_fn_group_banner 163 'DMRTest.at:455' \ +at_fn_group_banner 163 'DMRTest.at:474' \ "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1} test_array_7.1.xml.6.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15636,29 +16029,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[2:3]];/col=[[2:3]];s{i1} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:455: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \"" "DMRTest.at:455" +$as_echo "$at_srcdir/DMRTest.at:474: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \"" "DMRTest.at:474" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:474" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:455: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:455" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:474: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:474" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474" $at_failed && at_fn_log_failure $at_traceon; } @@ -15666,28 +16062,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:455: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true" "DMRTest.at:455" +$as_echo "$at_srcdir/DMRTest.at:474: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true" "DMRTest.at:474" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:455: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:455" +$as_echo "$at_srcdir/DMRTest.at:474: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:474" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474" $at_failed && at_fn_log_failure $at_traceon; } @@ -15701,7 +16097,7 @@ read at_status <"$at_status_file" #AT_STOP_163 #AT_START_164 -at_fn_group_banner 164 'DMRTest.at:456' \ +at_fn_group_banner 164 'DMRTest.at:475' \ "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]} test_array_7.1.xml.6.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15717,29 +16113,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/row=[[2:3]];/col=[[2:3]];s{i1[[]][[]]} "], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:456: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \"" "DMRTest.at:456" +$as_echo "$at_srcdir/DMRTest.at:475: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \"" "DMRTest.at:475" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:475" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:456: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:456" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:475: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:475" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475" $at_failed && at_fn_log_failure $at_traceon; } @@ -15747,28 +16146,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:456: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true" "DMRTest.at:456" +$as_echo "$at_srcdir/DMRTest.at:475: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true" "DMRTest.at:475" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:456: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:456" +$as_echo "$at_srcdir/DMRTest.at:475: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:475" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475" $at_failed && at_fn_log_failure $at_traceon; } @@ -15782,7 +16181,7 @@ read at_status <"$at_status_file" #AT_STOP_164 #AT_START_165 -at_fn_group_banner 165 'DMRTest.at:459' \ +at_fn_group_banner 165 'DMRTest.at:478' \ "trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15798,29 +16197,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s[[]]{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\"" "DMRTest.at:459" +$as_echo "$at_srcdir/DMRTest.at:478: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\"" "DMRTest.at:478" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:478" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:459: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:459" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:478: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:478" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:478" $at_failed && at_fn_log_failure $at_traceon; } @@ -15828,28 +16230,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\" || true" "DMRTest.at:459" +$as_echo "$at_srcdir/DMRTest.at:478: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\" || true" "DMRTest.at:478" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:478" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:459: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:459" +$as_echo "$at_srcdir/DMRTest.at:478: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:478" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:478" $at_failed && at_fn_log_failure $at_traceon; } @@ -15863,7 +16265,7 @@ read at_status <"$at_status_file" #AT_STOP_165 #AT_START_166 -at_fn_group_banner 166 'DMRTest.at:460' \ +at_fn_group_banner 166 'DMRTest.at:479' \ "trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15879,29 +16281,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s[[]]{i1[[]][[]]}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\"" "DMRTest.at:460" +$as_echo "$at_srcdir/DMRTest.at:479: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\"" "DMRTest.at:479" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:479" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:460: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:460" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:479: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:479" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:479" $at_failed && at_fn_log_failure $at_traceon; } @@ -15909,28 +16314,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\" || true" "DMRTest.at:460" +$as_echo "$at_srcdir/DMRTest.at:479: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\" || true" "DMRTest.at:479" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:479" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:460: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:460" +$as_echo "$at_srcdir/DMRTest.at:479: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:479" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:479" $at_failed && at_fn_log_failure $at_traceon; } @@ -15944,7 +16349,7 @@ read at_status <"$at_status_file" #AT_STOP_166 #AT_START_167 -at_fn_group_banner 167 'DMRTest.at:461' \ +at_fn_group_banner 167 'DMRTest.at:480' \ "trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -15960,29 +16365,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s{i1[[]][[]]}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:461: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\"" "DMRTest.at:461" +$as_echo "$at_srcdir/DMRTest.at:480: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\"" "DMRTest.at:480" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:480" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:461: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:461" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:480: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:480" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:480" $at_failed && at_fn_log_failure $at_traceon; } @@ -15990,28 +16398,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:461: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\" || true" "DMRTest.at:461" +$as_echo "$at_srcdir/DMRTest.at:480: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\" || true" "DMRTest.at:480" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:480" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:461: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:461" +$as_echo "$at_srcdir/DMRTest.at:480: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:480" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:480" $at_failed && at_fn_log_failure $at_traceon; } @@ -16025,7 +16433,7 @@ read at_status <"$at_status_file" #AT_STOP_167 #AT_START_168 -at_fn_group_banner 168 'DMRTest.at:463' \ +at_fn_group_banner 168 'DMRTest.at:482' \ "trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16041,29 +16449,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s[[]]{i1[[0]][[]]}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\"" "DMRTest.at:463" +$as_echo "$at_srcdir/DMRTest.at:482: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\"" "DMRTest.at:482" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:482" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:463: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:463" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:482: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:482" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:482" $at_failed && at_fn_log_failure $at_traceon; } @@ -16071,28 +16482,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\" || true" "DMRTest.at:463" +$as_echo "$at_srcdir/DMRTest.at:482: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\" || true" "DMRTest.at:482" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:482" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:463: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:463" +$as_echo "$at_srcdir/DMRTest.at:482: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:482" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:482" $at_failed && at_fn_log_failure $at_traceon; } @@ -16106,7 +16517,7 @@ read at_status <"$at_status_file" #AT_STOP_168 #AT_START_169 -at_fn_group_banner 169 'DMRTest.at:464' \ +at_fn_group_banner 169 'DMRTest.at:483' \ "trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16122,29 +16533,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s{i1[[0]][[]]}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:464: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\"" "DMRTest.at:464" +$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\"" "DMRTest.at:483" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:483" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:464: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:464" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:483: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:483" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483" $at_failed && at_fn_log_failure $at_traceon; } @@ -16152,28 +16566,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:464: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\" || true" "DMRTest.at:464" +$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\" || true" "DMRTest.at:483" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:464: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:464" +$as_echo "$at_srcdir/DMRTest.at:483: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:483" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483" $at_failed && at_fn_log_failure $at_traceon; } @@ -16187,7 +16601,7 @@ read at_status <"$at_status_file" #AT_STOP_169 #AT_START_170 -at_fn_group_banner 170 'DMRTest.at:466' \ +at_fn_group_banner 170 'DMRTest.at:485' \ "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16203,29 +16617,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s[[0]]{i1}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:466: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\"" "DMRTest.at:466" +$as_echo "$at_srcdir/DMRTest.at:485: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\"" "DMRTest.at:485" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:485" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:466: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:466" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:485: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:485" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:485" $at_failed && at_fn_log_failure $at_traceon; } @@ -16233,28 +16650,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:466: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\" || true" "DMRTest.at:466" +$as_echo "$at_srcdir/DMRTest.at:485: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\" || true" "DMRTest.at:485" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:485" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:466: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:466" +$as_echo "$at_srcdir/DMRTest.at:485: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:485" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:485" $at_failed && at_fn_log_failure $at_traceon; } @@ -16268,7 +16685,7 @@ read at_status <"$at_status_file" #AT_STOP_170 #AT_START_171 -at_fn_group_banner 171 'DMRTest.at:467' \ +at_fn_group_banner 171 'DMRTest.at:486' \ "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16284,29 +16701,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s[[0]]{i1[[]][[]]}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:467: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\"" "DMRTest.at:467" +$as_echo "$at_srcdir/DMRTest.at:486: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\"" "DMRTest.at:486" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:486" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:467: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:467" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:486: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:486" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:486" $at_failed && at_fn_log_failure $at_traceon; } @@ -16314,28 +16734,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:467: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\" || true" "DMRTest.at:467" +$as_echo "$at_srcdir/DMRTest.at:486: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\" || true" "DMRTest.at:486" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:486" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:467: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:467" +$as_echo "$at_srcdir/DMRTest.at:486: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:486" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:486" $at_failed && at_fn_log_failure $at_traceon; } @@ -16349,7 +16769,7 @@ read at_status <"$at_status_file" #AT_STOP_171 #AT_START_172 -at_fn_group_banner 172 'DMRTest.at:469' \ +at_fn_group_banner 172 'DMRTest.at:488' \ "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16365,29 +16785,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "/col=[[1:2]];s[[0]]{i1[[0]][[]]}"], [], [stdout], []) old version + { set +x -$as_echo "$at_srcdir/DMRTest.at:469: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\"" "DMRTest.at:469" +$as_echo "$at_srcdir/DMRTest.at:488: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\"" "DMRTest.at:488" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:488" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:469: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:469" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:488: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:488" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488" $at_failed && at_fn_log_failure $at_traceon; } @@ -16395,28 +16818,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:469: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\" || true" "DMRTest.at:469" +$as_echo "$at_srcdir/DMRTest.at:488: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\" || true" "DMRTest.at:488" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:469: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:469" +$as_echo "$at_srcdir/DMRTest.at:488: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:488" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488" $at_failed && at_fn_log_failure $at_traceon; } @@ -16430,7 +16853,7 @@ read at_status <"$at_status_file" #AT_STOP_172 #AT_START_173 -at_fn_group_banner 173 'DMRTest.at:473' \ +at_fn_group_banner 173 'DMRTest.at:492' \ "trans test_array_1.xml scale(x,1) test_array_1.xml.1.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16447,29 +16870,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:473" +$as_echo "$at_srcdir/DMRTest.at:492: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:492" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:492" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:473: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:473" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:492: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:492" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:492" $at_failed && at_fn_log_failure $at_traceon; } @@ -16477,28 +16903,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:473" +$as_echo "$at_srcdir/DMRTest.at:492: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:492" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:492" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:473: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:473" +$as_echo "$at_srcdir/DMRTest.at:492: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:492" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:492" $at_failed && at_fn_log_failure $at_traceon; } @@ -16512,7 +16938,7 @@ read at_status <"$at_status_file" #AT_STOP_173 #AT_START_174 -at_fn_group_banner 174 'DMRTest.at:474' \ +at_fn_group_banner 174 'DMRTest.at:493' \ "trans test_array_1.xml scale(x,10) test_array_1.xml.2.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16529,29 +16955,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:474: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:474" +$as_echo "$at_srcdir/DMRTest.at:493: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:493" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:493" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:474: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:474" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:493: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:493" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:493" $at_failed && at_fn_log_failure $at_traceon; } @@ -16559,28 +16988,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:474: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:474" +$as_echo "$at_srcdir/DMRTest.at:493: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:493" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:493" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:474: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:474" +$as_echo "$at_srcdir/DMRTest.at:493: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:493" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:493" $at_failed && at_fn_log_failure $at_traceon; } @@ -16594,7 +17023,7 @@ read at_status <"$at_status_file" #AT_STOP_174 #AT_START_175 -at_fn_group_banner 175 'DMRTest.at:475' \ +at_fn_group_banner 175 'DMRTest.at:494' \ "trans test_array_1.xml scale(x,-10) test_array_1.xml.3.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16611,29 +17040,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:475: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:475" +$as_echo "$at_srcdir/DMRTest.at:494: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:494" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:494" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:475: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:475" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:494: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:494" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:494" $at_failed && at_fn_log_failure $at_traceon; } @@ -16641,28 +17073,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:475: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:475" +$as_echo "$at_srcdir/DMRTest.at:494: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:494" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:494" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:475: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:475" +$as_echo "$at_srcdir/DMRTest.at:494: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:494" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:494" $at_failed && at_fn_log_failure $at_traceon; } @@ -16676,7 +17108,7 @@ read at_status <"$at_status_file" #AT_STOP_175 #AT_START_176 -at_fn_group_banner 176 'DMRTest.at:476' \ +at_fn_group_banner 176 'DMRTest.at:495' \ "trans test_array_1.xml scale(x,0.001) test_array_1.xml.4.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16693,29 +17125,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:476: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:476" +$as_echo "$at_srcdir/DMRTest.at:495: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:495" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:495" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:476: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:476" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:495: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:495" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:495" $at_failed && at_fn_log_failure $at_traceon; } @@ -16723,28 +17158,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:476: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:476" +$as_echo "$at_srcdir/DMRTest.at:495: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:495" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:495" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:476: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:476" +$as_echo "$at_srcdir/DMRTest.at:495: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:495" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:495" $at_failed && at_fn_log_failure $at_traceon; } @@ -16758,7 +17193,7 @@ read at_status <"$at_status_file" #AT_STOP_176 #AT_START_177 -at_fn_group_banner 177 'DMRTest.at:477' \ +at_fn_group_banner 177 'DMRTest.at:496' \ "trans test_array_1.xml scale(x,-0.001) test_array_1.xml.5.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16775,29 +17210,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:477: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:477" +$as_echo "$at_srcdir/DMRTest.at:496: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:496" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:496" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:477: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:477" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:496: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:496" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496" $at_failed && at_fn_log_failure $at_traceon; } @@ -16805,28 +17243,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:477: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:477" +$as_echo "$at_srcdir/DMRTest.at:496: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:496" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:477: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:477" +$as_echo "$at_srcdir/DMRTest.at:496: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:496" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496" $at_failed && at_fn_log_failure $at_traceon; } @@ -16840,7 +17278,7 @@ read at_status <"$at_status_file" #AT_STOP_177 #AT_START_178 -at_fn_group_banner 178 'DMRTest.at:481' \ +at_fn_group_banner 178 'DMRTest.at:500' \ "trans test_array_1.xml scale(x,0x7fffffffffffffff) test_array_1.xml.6.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16857,29 +17295,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:481: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:481" +$as_echo "$at_srcdir/DMRTest.at:500: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:500" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:500" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:481: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:481" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:500: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:500" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:500" $at_failed && at_fn_log_failure $at_traceon; } @@ -16887,28 +17328,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:481: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:481" +$as_echo "$at_srcdir/DMRTest.at:500: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:500" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:500" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:481: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:481" +$as_echo "$at_srcdir/DMRTest.at:500: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:500" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:500" $at_failed && at_fn_log_failure $at_traceon; } @@ -16922,7 +17363,7 @@ read at_status <"$at_status_file" #AT_STOP_178 #AT_START_179 -at_fn_group_banner 179 'DMRTest.at:483' \ +at_fn_group_banner 179 'DMRTest.at:502' \ "trans test_array_1.xml scale(x,0x8fffffffffffffff) test_array_1.xml.7.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -16939,29 +17380,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:483" +$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:502" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:502" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:483: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:483" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:502: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:502" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502" $at_failed && at_fn_log_failure $at_traceon; } @@ -16969,28 +17413,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:483" +$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:502" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:483: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:483" +$as_echo "$at_srcdir/DMRTest.at:502: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:502" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502" $at_failed && at_fn_log_failure $at_traceon; } @@ -17004,7 +17448,7 @@ read at_status <"$at_status_file" #AT_STOP_179 #AT_START_180 -at_fn_group_banner 180 'DMRTest.at:487' \ +at_fn_group_banner 180 'DMRTest.at:506' \ "trans test_array_5.xml scale(a,0.001) test_array_5.xml.1.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17021,29 +17465,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:487: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:487" +$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:506" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:506" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:487: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:487" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:506: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:506" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506" $at_failed && at_fn_log_failure $at_traceon; } @@ -17051,28 +17498,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:487: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:487" +$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:506" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:487: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:487" +$as_echo "$at_srcdir/DMRTest.at:506: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:506" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506" $at_failed && at_fn_log_failure $at_traceon; } @@ -17086,7 +17533,7 @@ read at_status <"$at_status_file" #AT_STOP_180 #AT_START_181 -at_fn_group_banner 181 'DMRTest.at:488' \ +at_fn_group_banner 181 'DMRTest.at:507' \ "trans test_array_5.xml scale(b,0.001) test_array_5.xml.2.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17103,29 +17550,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:488: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:488" +$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:507" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:507" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:488: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:488" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:507: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:507" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507" $at_failed && at_fn_log_failure $at_traceon; } @@ -17133,28 +17583,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:488: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:488" +$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:507" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:488: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:488" +$as_echo "$at_srcdir/DMRTest.at:507: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:507" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507" $at_failed && at_fn_log_failure $at_traceon; } @@ -17168,7 +17618,7 @@ read at_status <"$at_status_file" #AT_STOP_181 #AT_START_182 -at_fn_group_banner 182 'DMRTest.at:490' \ +at_fn_group_banner 182 'DMRTest.at:509' \ "trans test_array_5.xml scale(c,0.001) test_array_5.xml.3.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17185,29 +17635,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:490: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:490" +$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:509" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:509" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:490: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:490" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:509: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:509" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509" $at_failed && at_fn_log_failure $at_traceon; } @@ -17215,28 +17668,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:490: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:490" +$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:509" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:490: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:490" +$as_echo "$at_srcdir/DMRTest.at:509: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:509" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509" $at_failed && at_fn_log_failure $at_traceon; } @@ -17250,7 +17703,7 @@ read at_status <"$at_status_file" #AT_STOP_182 #AT_START_183 -at_fn_group_banner 183 'DMRTest.at:491' \ +at_fn_group_banner 183 'DMRTest.at:510' \ "trans test_array_5.xml scale(d,0.001) test_array_5.xml.4.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17267,29 +17720,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:491: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:491" +$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:510" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:510" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:491: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:491" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:510: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:510" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510" $at_failed && at_fn_log_failure $at_traceon; } @@ -17297,28 +17753,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:491: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:491" +$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:510" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:491: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:491" +$as_echo "$at_srcdir/DMRTest.at:510: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:510" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510" $at_failed && at_fn_log_failure $at_traceon; } @@ -17332,7 +17788,7 @@ read at_status <"$at_status_file" #AT_STOP_183 #AT_START_184 -at_fn_group_banner 184 'DMRTest.at:496' \ +at_fn_group_banner 184 'DMRTest.at:515' \ "trans vol_1_ce_1.xml scale(u,10) vol_1_ce_1.xml.1.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17349,29 +17805,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:496: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:496" +$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:515" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:515" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:496: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:496" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:515: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:515" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515" $at_failed && at_fn_log_failure $at_traceon; } @@ -17379,28 +17838,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:496: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:496" +$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:515" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:496: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:496" +$as_echo "$at_srcdir/DMRTest.at:515: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:515" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515" $at_failed && at_fn_log_failure $at_traceon; } @@ -17414,7 +17873,7 @@ read at_status <"$at_status_file" #AT_STOP_184 #AT_START_185 -at_fn_group_banner 185 'DMRTest.at:497' \ +at_fn_group_banner 185 'DMRTest.at:516' \ "trans vol_1_ce_1.xml scale(u,v) vol_1_ce_1.xml.2.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17431,29 +17890,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:497: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:497" +$as_echo "$at_srcdir/DMRTest.at:516: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:516" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:516" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:497: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:497" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:516: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:516" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:516" $at_failed && at_fn_log_failure $at_traceon; } @@ -17461,28 +17923,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:497: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:497" +$as_echo "$at_srcdir/DMRTest.at:516: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:516" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:516" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:497: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:497" +$as_echo "$at_srcdir/DMRTest.at:516: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:516" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:516" $at_failed && at_fn_log_failure $at_traceon; } @@ -17496,7 +17958,7 @@ read at_status <"$at_status_file" #AT_STOP_185 #AT_START_186 -at_fn_group_banner 186 'DMRTest.at:498' \ +at_fn_group_banner 186 'DMRTest.at:517' \ "trans vol_1_ce_1.xml scale(scale(u,10),0.01) vol_1_ce_1.xml.3.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17513,29 +17975,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:498: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:498" +$as_echo "$at_srcdir/DMRTest.at:517: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:517" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:517" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:498: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:498" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:517: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:517" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:517" $at_failed && at_fn_log_failure $at_traceon; } @@ -17543,28 +18008,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:498: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:498" +$as_echo "$at_srcdir/DMRTest.at:517: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:517" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:517" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:498: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:498" +$as_echo "$at_srcdir/DMRTest.at:517: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:517" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:517" $at_failed && at_fn_log_failure $at_traceon; } @@ -17578,7 +18043,7 @@ read at_status <"$at_status_file" #AT_STOP_186 #AT_START_187 -at_fn_group_banner 187 'DMRTest.at:501' \ +at_fn_group_banner 187 'DMRTest.at:520' \ "trans vol_1_ce_1.xml scale(Point.x,10) vol_1_ce_1.xml.4.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17595,29 +18060,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:501: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:501" +$as_echo "$at_srcdir/DMRTest.at:520: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:520" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:520" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:501: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:501" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:520: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:520" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520" $at_failed && at_fn_log_failure $at_traceon; } @@ -17625,28 +18093,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:501: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:501" +$as_echo "$at_srcdir/DMRTest.at:520: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:520" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:501: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:501" +$as_echo "$at_srcdir/DMRTest.at:520: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:520" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520" $at_failed && at_fn_log_failure $at_traceon; } @@ -17660,7 +18128,7 @@ read at_status <"$at_status_file" #AT_STOP_187 #AT_START_188 -at_fn_group_banner 188 'DMRTest.at:502' \ +at_fn_group_banner 188 'DMRTest.at:521' \ "trans vol_1_ce_1.xml scale(Point.x,Point.y) vol_1_ce_1.xml.5.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17677,29 +18145,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:502" +$as_echo "$at_srcdir/DMRTest.at:521: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:521" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:521" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:502: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:502" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:521: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:521" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521" $at_failed && at_fn_log_failure $at_traceon; } @@ -17707,28 +18178,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:502" +$as_echo "$at_srcdir/DMRTest.at:521: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:521" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:502: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:502" +$as_echo "$at_srcdir/DMRTest.at:521: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:521" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521" $at_failed && at_fn_log_failure $at_traceon; } @@ -17742,7 +18213,7 @@ read at_status <"$at_status_file" #AT_STOP_188 #AT_START_189 -at_fn_group_banner 189 'DMRTest.at:503' \ +at_fn_group_banner 189 'DMRTest.at:522' \ "trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01) vol_1_ce_1.xml.6.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17759,29 +18230,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:503: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:503" +$as_echo "$at_srcdir/DMRTest.at:522: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:522" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:522" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:503: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:503" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:522: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:522" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:522" $at_failed && at_fn_log_failure $at_traceon; } @@ -17789,28 +18263,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:503: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:503" +$as_echo "$at_srcdir/DMRTest.at:522: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:522" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:522" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:503: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:503" +$as_echo "$at_srcdir/DMRTest.at:522: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:522" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:522" $at_failed && at_fn_log_failure $at_traceon; } @@ -17824,7 +18298,7 @@ read at_status <"$at_status_file" #AT_STOP_189 #AT_START_190 -at_fn_group_banner 190 'DMRTest.at:506' \ +at_fn_group_banner 190 'DMRTest.at:525' \ "trans vol_1_ce_1.xml scale(\\\$Byte(20:1,2,3,4),10) vol_1_ce_1.xml.7.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17841,29 +18315,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:506" +$as_echo "$at_srcdir/DMRTest.at:525: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:525" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:525" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:506: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:506" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:525: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:525" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:525" $at_failed && at_fn_log_failure $at_traceon; } @@ -17871,28 +18348,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:506" +$as_echo "$at_srcdir/DMRTest.at:525: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:525" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:525" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:506: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:506" +$as_echo "$at_srcdir/DMRTest.at:525: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:525" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:525" $at_failed && at_fn_log_failure $at_traceon; } @@ -17906,7 +18383,7 @@ read at_status <"$at_status_file" #AT_STOP_190 #AT_START_191 -at_fn_group_banner 191 'DMRTest.at:507' \ +at_fn_group_banner 191 'DMRTest.at:526' \ "trans vol_1_ce_1.xml scale(\\\$Int8(20:10,11,12,-9),10) vol_1_ce_1.xml.8.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -17923,29 +18400,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:507" +$as_echo "$at_srcdir/DMRTest.at:526: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:526" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:526" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:507: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:507" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:526: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:526" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:526" $at_failed && at_fn_log_failure $at_traceon; } @@ -17953,28 +18433,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:507" +$as_echo "$at_srcdir/DMRTest.at:526: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:526" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:526" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:507: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:507" +$as_echo "$at_srcdir/DMRTest.at:526: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:526" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:526" $at_failed && at_fn_log_failure $at_traceon; } @@ -17988,7 +18468,7 @@ read at_status <"$at_status_file" #AT_STOP_191 #AT_START_192 -at_fn_group_banner 192 'DMRTest.at:508' \ +at_fn_group_banner 192 'DMRTest.at:527' \ "trans vol_1_ce_1.xml scale(\\\$UInt16(20:1,2,3,4),10) vol_1_ce_1.xml.9.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18005,29 +18485,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:508: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:508" +$as_echo "$at_srcdir/DMRTest.at:527: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:527" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:527" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:508: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:508" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:527: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:527" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:527" $at_failed && at_fn_log_failure $at_traceon; } @@ -18035,28 +18518,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:508: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:508" +$as_echo "$at_srcdir/DMRTest.at:527: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:527" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:527" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:508: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:508" +$as_echo "$at_srcdir/DMRTest.at:527: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:527" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:527" $at_failed && at_fn_log_failure $at_traceon; } @@ -18070,7 +18553,7 @@ read at_status <"$at_status_file" #AT_STOP_192 #AT_START_193 -at_fn_group_banner 193 'DMRTest.at:509' \ +at_fn_group_banner 193 'DMRTest.at:528' \ "trans vol_1_ce_1.xml scale(\\\$Int16(20:1,2,3,-4),10) vol_1_ce_1.xml.10.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18087,29 +18570,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:509" +$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:528" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:528" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:509: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:509" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:528: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:528" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528" $at_failed && at_fn_log_failure $at_traceon; } @@ -18117,28 +18603,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:509" +$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:528" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:509: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:509" +$as_echo "$at_srcdir/DMRTest.at:528: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:528" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528" $at_failed && at_fn_log_failure $at_traceon; } @@ -18152,7 +18638,7 @@ read at_status <"$at_status_file" #AT_STOP_193 #AT_START_194 -at_fn_group_banner 194 'DMRTest.at:510' \ +at_fn_group_banner 194 'DMRTest.at:529' \ "trans vol_1_ce_1.xml scale(\\\$UInt32(20:1,2,3,4),10) vol_1_ce_1.xml.11.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18169,29 +18655,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:510" +$as_echo "$at_srcdir/DMRTest.at:529: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:529" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:529" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:510: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:510" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:529: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:529" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:529" $at_failed && at_fn_log_failure $at_traceon; } @@ -18199,28 +18688,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:510" +$as_echo "$at_srcdir/DMRTest.at:529: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:529" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:529" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:510: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:510" +$as_echo "$at_srcdir/DMRTest.at:529: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:529" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:529" $at_failed && at_fn_log_failure $at_traceon; } @@ -18234,7 +18723,7 @@ read at_status <"$at_status_file" #AT_STOP_194 #AT_START_195 -at_fn_group_banner 195 'DMRTest.at:511' \ +at_fn_group_banner 195 'DMRTest.at:530' \ "trans vol_1_ce_1.xml scale(\\\$Int32(20:1,2,3,-4),10) vol_1_ce_1.xml.12.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18251,29 +18740,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:511: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:511" +$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:530" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:530" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:511: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:511" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:530: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:530" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530" $at_failed && at_fn_log_failure $at_traceon; } @@ -18281,28 +18773,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:511: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:511" +$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:530" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:511: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:511" +$as_echo "$at_srcdir/DMRTest.at:530: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:530" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530" $at_failed && at_fn_log_failure $at_traceon; } @@ -18316,7 +18808,7 @@ read at_status <"$at_status_file" #AT_STOP_195 #AT_START_196 -at_fn_group_banner 196 'DMRTest.at:512' \ +at_fn_group_banner 196 'DMRTest.at:531' \ "trans vol_1_ce_1.xml scale(\\\$UInt64(20:1,2,3,0xffffffffffffffff),1) vol_1_ce_1.xml.13.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18333,29 +18825,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:512: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:512" +$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:531" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:531" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:512: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:512" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:531: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:531" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531" $at_failed && at_fn_log_failure $at_traceon; } @@ -18363,28 +18858,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:512: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:512" +$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:531" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:512: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:512" +$as_echo "$at_srcdir/DMRTest.at:531: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:531" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531" $at_failed && at_fn_log_failure $at_traceon; } @@ -18398,7 +18893,7 @@ read at_status <"$at_status_file" #AT_STOP_196 #AT_START_197 -at_fn_group_banner 197 'DMRTest.at:513' \ +at_fn_group_banner 197 'DMRTest.at:532' \ "trans vol_1_ce_1.xml scale(\\\$Int64(20:1,2,3,0x7fffffffffffffff),1) vol_1_ce_1.xml.14.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18415,29 +18910,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:513: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:513" +$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:532" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:532" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:513: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:513" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:532: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:532" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532" $at_failed && at_fn_log_failure $at_traceon; } @@ -18445,28 +18943,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:513: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:513" +$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:532" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:513: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:513" +$as_echo "$at_srcdir/DMRTest.at:532: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:532" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532" $at_failed && at_fn_log_failure $at_traceon; } @@ -18480,7 +18978,7 @@ read at_status <"$at_status_file" #AT_STOP_197 #AT_START_198 -at_fn_group_banner 198 'DMRTest.at:514' \ +at_fn_group_banner 198 'DMRTest.at:533' \ "trans vol_1_ce_1.xml scale(\\\$Float32(20:1,2,3,4.55),10) vol_1_ce_1.xml.15.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18497,29 +18995,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:514: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:514" +$as_echo "$at_srcdir/DMRTest.at:533: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:533" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:533" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:514: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:514" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:533: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:533" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533" $at_failed && at_fn_log_failure $at_traceon; } @@ -18527,28 +19028,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:514: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:514" +$as_echo "$at_srcdir/DMRTest.at:533: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:533" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:514: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:514" +$as_echo "$at_srcdir/DMRTest.at:533: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:533" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533" $at_failed && at_fn_log_failure $at_traceon; } @@ -18562,7 +19063,7 @@ read at_status <"$at_status_file" #AT_STOP_198 #AT_START_199 -at_fn_group_banner 199 'DMRTest.at:515' \ +at_fn_group_banner 199 'DMRTest.at:534' \ "trans vol_1_ce_1.xml scale(\\\$Float64(20:1,2,3,4.55),10) vol_1_ce_1.xml.16.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18579,29 +19080,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:515" +$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:534" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:534" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:515: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:515" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:534: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:534" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534" $at_failed && at_fn_log_failure $at_traceon; } @@ -18609,28 +19113,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:515" +$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:534" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:515: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:515" +$as_echo "$at_srcdir/DMRTest.at:534: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:534" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534" $at_failed && at_fn_log_failure $at_traceon; } @@ -18644,7 +19148,7 @@ read at_status <"$at_status_file" #AT_STOP_199 #AT_START_200 -at_fn_group_banner 200 'DMRTest.at:519' \ +at_fn_group_banner 200 'DMRTest.at:538' \ "trans vol_1_ce_10.xml scale(lat,10) vol_1_ce_10.xml.1.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18661,29 +19165,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:519: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:519" +$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:538" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:538" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:519: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:519" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:538: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:538" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538" $at_failed && at_fn_log_failure $at_traceon; } @@ -18691,28 +19198,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:519: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:519" +$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:538" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:519: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:519" +$as_echo "$at_srcdir/DMRTest.at:538: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:538" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538" $at_failed && at_fn_log_failure $at_traceon; } @@ -18726,7 +19233,7 @@ read at_status <"$at_status_file" #AT_STOP_200 #AT_START_201 -at_fn_group_banner 201 'DMRTest.at:520' \ +at_fn_group_banner 201 'DMRTest.at:539' \ "trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) vol_1_ce_10.xml.2.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18743,29 +19250,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:520: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:520" +$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:539" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:539" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:520: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:520" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:539: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:539" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539" $at_failed && at_fn_log_failure $at_traceon; } @@ -18773,28 +19283,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:520: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:520" +$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:539" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:520: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:520" +$as_echo "$at_srcdir/DMRTest.at:539: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:539" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539" $at_failed && at_fn_log_failure $at_traceon; } @@ -18808,7 +19318,7 @@ read at_status <"$at_status_file" #AT_STOP_201 #AT_START_202 -at_fn_group_banner 202 'DMRTest.at:521' \ +at_fn_group_banner 202 'DMRTest.at:540' \ "trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) lat[10:11][10:11];lon[10:11][10:11] vol_1_ce_10.xml.3.func_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18825,29 +19335,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:521: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:521" +$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\"" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:540" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:540" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:521: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:521" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:540: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:540" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540" $at_failed && at_fn_log_failure $at_traceon; } @@ -18855,28 +19368,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:521: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:521" +$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:540" ( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:521: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:521" +$as_echo "$at_srcdir/DMRTest.at:540: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:540" ( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540" $at_failed && at_fn_log_failure $at_traceon; } @@ -18890,7 +19403,7 @@ read at_status <"$at_status_file" #AT_STOP_202 #AT_START_203 -at_fn_group_banner 203 'DMRTest.at:528' \ +at_fn_group_banner 203 'DMRTest.at:547' \ "filter test_simple_7.xml s test_simple_7.xml.f.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18906,29 +19419,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:528" +$as_echo "$at_srcdir/DMRTest.at:547: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:547" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:547" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:528: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:528" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:547: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:547" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547" $at_failed && at_fn_log_failure $at_traceon; } @@ -18936,28 +19452,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:528" +$as_echo "$at_srcdir/DMRTest.at:547: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:547" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:528: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:528" +$as_echo "$at_srcdir/DMRTest.at:547: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:547" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547" $at_failed && at_fn_log_failure $at_traceon; } @@ -18971,7 +19487,7 @@ read at_status <"$at_status_file" #AT_STOP_203 #AT_START_204 -at_fn_group_banner 204 'DMRTest.at:530' \ +at_fn_group_banner 204 'DMRTest.at:549' \ "filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -18987,29 +19503,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:530" +$as_echo "$at_srcdir/DMRTest.at:549: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:549" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:549" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:530: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:530" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:549: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:549" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:549" $at_failed && at_fn_log_failure $at_traceon; } @@ -19017,28 +19536,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:530" +$as_echo "$at_srcdir/DMRTest.at:549: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:549" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:549" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:530: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:530" +$as_echo "$at_srcdir/DMRTest.at:549: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:549" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:549" $at_failed && at_fn_log_failure $at_traceon; } @@ -19052,7 +19571,7 @@ read at_status <"$at_status_file" #AT_STOP_204 #AT_START_205 -at_fn_group_banner 205 'DMRTest.at:531' \ +at_fn_group_banner 205 'DMRTest.at:550' \ "filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19068,29 +19587,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:531" +$as_echo "$at_srcdir/DMRTest.at:550: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:550" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:550" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:531: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:531" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:550: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:550" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:550" $at_failed && at_fn_log_failure $at_traceon; } @@ -19098,28 +19620,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:531" +$as_echo "$at_srcdir/DMRTest.at:550: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:550" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:550" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:531: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:531" +$as_echo "$at_srcdir/DMRTest.at:550: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:550" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:550" $at_failed && at_fn_log_failure $at_traceon; } @@ -19133,7 +19655,7 @@ read at_status <"$at_status_file" #AT_STOP_205 #AT_START_206 -at_fn_group_banner 206 'DMRTest.at:532' \ +at_fn_group_banner 206 'DMRTest.at:551' \ "filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19149,29 +19671,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:532" +$as_echo "$at_srcdir/DMRTest.at:551: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:551" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:551" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:532: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:532" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:551: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:551" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:551" $at_failed && at_fn_log_failure $at_traceon; } @@ -19179,28 +19704,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:532" +$as_echo "$at_srcdir/DMRTest.at:551: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:551" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:551" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:532: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:532" +$as_echo "$at_srcdir/DMRTest.at:551: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:551" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:551" $at_failed && at_fn_log_failure $at_traceon; } @@ -19214,7 +19739,7 @@ read at_status <"$at_status_file" #AT_STOP_206 #AT_START_207 -at_fn_group_banner 207 'DMRTest.at:533' \ +at_fn_group_banner 207 'DMRTest.at:552' \ "filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19230,29 +19755,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:533: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:533" +$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:552" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:552" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:533: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:533" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:552: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:552" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552" $at_failed && at_fn_log_failure $at_traceon; } @@ -19260,28 +19788,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:533: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:533" +$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:552" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:533: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:533" +$as_echo "$at_srcdir/DMRTest.at:552: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:552" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552" $at_failed && at_fn_log_failure $at_traceon; } @@ -19295,7 +19823,7 @@ read at_status <"$at_status_file" #AT_STOP_207 #AT_START_208 -at_fn_group_banner 208 'DMRTest.at:534' \ +at_fn_group_banner 208 'DMRTest.at:553' \ "filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19311,29 +19839,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:534" +$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:553" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:553" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:534: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:534" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:553: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:553" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553" $at_failed && at_fn_log_failure $at_traceon; } @@ -19341,28 +19872,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:534" +$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:553" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:534: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:534" +$as_echo "$at_srcdir/DMRTest.at:553: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:553" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553" $at_failed && at_fn_log_failure $at_traceon; } @@ -19376,7 +19907,7 @@ read at_status <"$at_status_file" #AT_STOP_208 #AT_START_209 -at_fn_group_banner 209 'DMRTest.at:535' \ +at_fn_group_banner 209 'DMRTest.at:554' \ "filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19392,29 +19923,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:535: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:535" +$as_echo "$at_srcdir/DMRTest.at:554: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:554" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:554" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:535: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:535" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:554: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:554" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:554" $at_failed && at_fn_log_failure $at_traceon; } @@ -19422,28 +19956,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:535: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:535" +$as_echo "$at_srcdir/DMRTest.at:554: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:554" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:554" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:535: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:535" +$as_echo "$at_srcdir/DMRTest.at:554: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:554" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:554" $at_failed && at_fn_log_failure $at_traceon; } @@ -19457,7 +19991,7 @@ read at_status <"$at_status_file" #AT_STOP_209 #AT_START_210 -at_fn_group_banner 210 'DMRTest.at:536' \ +at_fn_group_banner 210 'DMRTest.at:555' \ "filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19473,29 +20007,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:536: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:536" +$as_echo "$at_srcdir/DMRTest.at:555: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:555" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:555" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:536: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:536" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:555: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:555" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:555" $at_failed && at_fn_log_failure $at_traceon; } @@ -19503,28 +20040,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:536: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:536" +$as_echo "$at_srcdir/DMRTest.at:555: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:555" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:555" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:536: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:536" +$as_echo "$at_srcdir/DMRTest.at:555: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:555" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:555" $at_failed && at_fn_log_failure $at_traceon; } @@ -19538,7 +20075,7 @@ read at_status <"$at_status_file" #AT_STOP_210 #AT_START_211 -at_fn_group_banner 211 'DMRTest.at:538' \ +at_fn_group_banner 211 'DMRTest.at:557' \ "filter test_simple_7.xml s|1024[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:538" +$as_echo "$at_srcdir/DMRTest.at:557: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:557" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:557" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:538: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:538" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:557: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:557" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557" $at_failed && at_fn_log_failure $at_traceon; } @@ -19584,28 +20124,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:538" +$as_echo "$at_srcdir/DMRTest.at:557: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:557" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:538: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:538" +$as_echo "$at_srcdir/DMRTest.at:557: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:557" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557" $at_failed && at_fn_log_failure $at_traceon; } @@ -19619,7 +20159,7 @@ read at_status <"$at_status_file" #AT_STOP_211 #AT_START_212 -at_fn_group_banner 212 'DMRTest.at:539' \ +at_fn_group_banner 212 'DMRTest.at:558' \ "filter test_simple_7.xml s|1024<=i1<=32768 test_simple_7.xml.f9.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19635,29 +20175,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:539" +$as_echo "$at_srcdir/DMRTest.at:558: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:558" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:558" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:539: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:539" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:558: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:558" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558" $at_failed && at_fn_log_failure $at_traceon; } @@ -19665,28 +20208,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:539" +$as_echo "$at_srcdir/DMRTest.at:558: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:558" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:539: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:539" +$as_echo "$at_srcdir/DMRTest.at:558: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:558" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558" $at_failed && at_fn_log_failure $at_traceon; } @@ -19700,7 +20243,7 @@ read at_status <"$at_status_file" #AT_STOP_212 #AT_START_213 -at_fn_group_banner 213 'DMRTest.at:540' \ +at_fn_group_banner 213 'DMRTest.at:559' \ "filter test_simple_7.xml s|i1>=1024.0 test_simple_7.xml.fa.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19716,29 +20259,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:540" +$as_echo "$at_srcdir/DMRTest.at:559: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:559" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:559" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:540: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:540" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:559: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:559" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559" $at_failed && at_fn_log_failure $at_traceon; } @@ -19746,28 +20292,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:540" +$as_echo "$at_srcdir/DMRTest.at:559: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:559" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:540: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:540" +$as_echo "$at_srcdir/DMRTest.at:559: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:559" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559" $at_failed && at_fn_log_failure $at_traceon; } @@ -19781,7 +20327,7 @@ read at_status <"$at_status_file" #AT_STOP_213 #AT_START_214 -at_fn_group_banner 214 'DMRTest.at:542' \ +at_fn_group_banner 214 'DMRTest.at:561' \ "filter test_simple_7.xml s|s==\\\"Silly test string: 2\\\" test_simple_7.xml.fs1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19797,29 +20343,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:542: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:542" +$as_echo "$at_srcdir/DMRTest.at:561: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:561" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:561" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:542: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:542" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:561: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:561" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:561" $at_failed && at_fn_log_failure $at_traceon; } @@ -19827,28 +20376,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:542: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:542" +$as_echo "$at_srcdir/DMRTest.at:561: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:561" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:561" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:542: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:542" +$as_echo "$at_srcdir/DMRTest.at:561: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:561" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:561" $at_failed && at_fn_log_failure $at_traceon; } @@ -19862,7 +20411,7 @@ read at_status <"$at_status_file" #AT_STOP_214 #AT_START_215 -at_fn_group_banner 215 'DMRTest.at:543' \ +at_fn_group_banner 215 'DMRTest.at:562' \ "filter test_simple_7.xml s|s!=\\\"Silly test string: 2\\\" test_simple_7.xml.fs2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19878,29 +20427,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:543: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:543" +$as_echo "$at_srcdir/DMRTest.at:562: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:562" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:562" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:543: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:543" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:562: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:562" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:562" $at_failed && at_fn_log_failure $at_traceon; } @@ -19908,28 +20460,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:543: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:543" +$as_echo "$at_srcdir/DMRTest.at:562: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:562" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:562" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:543: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:543" +$as_echo "$at_srcdir/DMRTest.at:562: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:562" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:562" $at_failed && at_fn_log_failure $at_traceon; } @@ -19943,7 +20495,7 @@ read at_status <"$at_status_file" #AT_STOP_215 #AT_START_216 -at_fn_group_banner 216 'DMRTest.at:544' \ +at_fn_group_banner 216 'DMRTest.at:563' \ "filter test_simple_7.xml s|s<\\\"Silly test string: 2\\\" test_simple_7.xml.fs3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -19959,29 +20511,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:544: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:544" +$as_echo "$at_srcdir/DMRTest.at:563: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:563" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:563" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:544: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:544" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:563: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:563" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:563" $at_failed && at_fn_log_failure $at_traceon; } @@ -19989,28 +20544,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:544: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:544" +$as_echo "$at_srcdir/DMRTest.at:563: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:563" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:563" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:544: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:544" +$as_echo "$at_srcdir/DMRTest.at:563: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:563" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:563" $at_failed && at_fn_log_failure $at_traceon; } @@ -20024,7 +20579,7 @@ read at_status <"$at_status_file" #AT_STOP_216 #AT_START_217 -at_fn_group_banner 217 'DMRTest.at:545' \ +at_fn_group_banner 217 'DMRTest.at:564' \ "filter test_simple_7.xml s|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.fs4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20040,29 +20595,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:545: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:545" +$as_echo "$at_srcdir/DMRTest.at:564: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:564" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:564" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:545: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:545" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:564: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:564" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:564" $at_failed && at_fn_log_failure $at_traceon; } @@ -20070,28 +20628,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:545: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:545" +$as_echo "$at_srcdir/DMRTest.at:564: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:564" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:564" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:545: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:545" +$as_echo "$at_srcdir/DMRTest.at:564: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:564" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:564" $at_failed && at_fn_log_failure $at_traceon; } @@ -20105,7 +20663,7 @@ read at_status <"$at_status_file" #AT_STOP_217 #AT_START_218 -at_fn_group_banner 218 'DMRTest.at:546' \ +at_fn_group_banner 218 'DMRTest.at:565' \ "filter test_simple_7.xml s|s>\\\"Silly test string: 2\\\" test_simple_7.xml.fs5.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20121,29 +20679,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:546: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:546" +$as_echo "$at_srcdir/DMRTest.at:565: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:565" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:565" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:546: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:546" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:565: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:565" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:565" $at_failed && at_fn_log_failure $at_traceon; } @@ -20151,28 +20712,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:546: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:546" +$as_echo "$at_srcdir/DMRTest.at:565: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:565" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:565" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:546: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:546" +$as_echo "$at_srcdir/DMRTest.at:565: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:565" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:565" $at_failed && at_fn_log_failure $at_traceon; } @@ -20186,7 +20747,7 @@ read at_status <"$at_status_file" #AT_STOP_218 #AT_START_219 -at_fn_group_banner 219 'DMRTest.at:547' \ +at_fn_group_banner 219 'DMRTest.at:566' \ "filter test_simple_7.xml s|s>=\\\"Silly test string: 2\\\" test_simple_7.xml.fs6.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20202,29 +20763,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:547: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:547" +$as_echo "$at_srcdir/DMRTest.at:566: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:566" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:566" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:547: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:547" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:566: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:566" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:566" $at_failed && at_fn_log_failure $at_traceon; } @@ -20232,28 +20796,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:547: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:547" +$as_echo "$at_srcdir/DMRTest.at:566: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:566" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:566" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:547: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:547" +$as_echo "$at_srcdir/DMRTest.at:566: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:566" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:566" $at_failed && at_fn_log_failure $at_traceon; } @@ -20267,7 +20831,7 @@ read at_status <"$at_status_file" #AT_STOP_219 #AT_START_220 -at_fn_group_banner 220 'DMRTest.at:548' \ +at_fn_group_banner 220 'DMRTest.at:567' \ "filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20283,29 +20847,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:548: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:548" +$as_echo "$at_srcdir/DMRTest.at:567: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:567" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:567" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:548: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:548" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:567: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:567" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567" $at_failed && at_fn_log_failure $at_traceon; } @@ -20313,28 +20880,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:548: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:548" +$as_echo "$at_srcdir/DMRTest.at:567: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:567" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:548: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:548" +$as_echo "$at_srcdir/DMRTest.at:567: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:567" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567" $at_failed && at_fn_log_failure $at_traceon; } @@ -20348,7 +20915,7 @@ read at_status <"$at_status_file" #AT_STOP_220 #AT_START_221 -at_fn_group_banner 221 'DMRTest.at:552' \ +at_fn_group_banner 221 'DMRTest.at:571' \ "filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20364,29 +20931,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:552" +$as_echo "$at_srcdir/DMRTest.at:571: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:571" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:571" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:552: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:552" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:571: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:571" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571" $at_failed && at_fn_log_failure $at_traceon; } @@ -20394,28 +20964,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:552" +$as_echo "$at_srcdir/DMRTest.at:571: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:571" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:552: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:552" +$as_echo "$at_srcdir/DMRTest.at:571: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:571" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571" $at_failed && at_fn_log_failure $at_traceon; } @@ -20429,7 +20999,7 @@ read at_status <"$at_status_file" #AT_STOP_221 #AT_START_222 -at_fn_group_banner 222 'DMRTest.at:553' \ +at_fn_group_banner 222 'DMRTest.at:572' \ "filter test_simple_7.xml s{i1}|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.g1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20445,29 +21015,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:553" +$as_echo "$at_srcdir/DMRTest.at:572: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:572" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:572" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:553: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:553" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:572: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:572" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572" $at_failed && at_fn_log_failure $at_traceon; } @@ -20475,28 +21048,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:553" +$as_echo "$at_srcdir/DMRTest.at:572: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:572" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:553: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:553" +$as_echo "$at_srcdir/DMRTest.at:572: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:572" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572" $at_failed && at_fn_log_failure $at_traceon; } @@ -20510,7 +21083,7 @@ read at_status <"$at_status_file" #AT_STOP_222 #AT_START_223 -at_fn_group_banner 223 'DMRTest.at:556' \ +at_fn_group_banner 223 'DMRTest.at:575' \ "filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20526,29 +21099,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:556: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:556" +$as_echo "$at_srcdir/DMRTest.at:575: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:575" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:575" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:556: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:556" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:575: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:575" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575" $at_failed && at_fn_log_failure $at_traceon; } @@ -20556,28 +21132,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:556: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:556" +$as_echo "$at_srcdir/DMRTest.at:575: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:575" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:556: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:556" +$as_echo "$at_srcdir/DMRTest.at:575: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:575" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575" $at_failed && at_fn_log_failure $at_traceon; } @@ -20591,7 +21167,7 @@ read at_status <"$at_status_file" #AT_STOP_223 #AT_START_224 -at_fn_group_banner 224 'DMRTest.at:557' \ +at_fn_group_banner 224 'DMRTest.at:576' \ "filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20607,29 +21183,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:557: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:557" +$as_echo "$at_srcdir/DMRTest.at:576: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:576" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:576" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:557: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:557" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:576: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:576" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576" $at_failed && at_fn_log_failure $at_traceon; } @@ -20637,28 +21216,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:557: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:557" +$as_echo "$at_srcdir/DMRTest.at:576: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:576" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:557: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:557" +$as_echo "$at_srcdir/DMRTest.at:576: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:576" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576" $at_failed && at_fn_log_failure $at_traceon; } @@ -20672,7 +21251,7 @@ read at_status <"$at_status_file" #AT_STOP_224 #AT_START_225 -at_fn_group_banner 225 'DMRTest.at:558' \ +at_fn_group_banner 225 'DMRTest.at:577' \ "filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20688,29 +21267,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:558: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:558" +$as_echo "$at_srcdir/DMRTest.at:577: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:577" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:577" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:558: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:558" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:577: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:577" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:577" $at_failed && at_fn_log_failure $at_traceon; } @@ -20718,28 +21300,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:558: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:558" +$as_echo "$at_srcdir/DMRTest.at:577: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:577" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:577" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:558: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:558" +$as_echo "$at_srcdir/DMRTest.at:577: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:577" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:577" $at_failed && at_fn_log_failure $at_traceon; } @@ -20753,7 +21335,7 @@ read at_status <"$at_status_file" #AT_STOP_225 #AT_START_226 -at_fn_group_banner 226 'DMRTest.at:559' \ +at_fn_group_banner 226 'DMRTest.at:578' \ "filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20769,29 +21351,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:559: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:559" +$as_echo "$at_srcdir/DMRTest.at:578: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:578" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:578" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:559: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:559" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:578: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:578" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:578" $at_failed && at_fn_log_failure $at_traceon; } @@ -20799,28 +21384,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:559: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:559" +$as_echo "$at_srcdir/DMRTest.at:578: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:578" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:578" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:559: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:559" +$as_echo "$at_srcdir/DMRTest.at:578: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:578" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:578" $at_failed && at_fn_log_failure $at_traceon; } @@ -20834,7 +21419,7 @@ read at_status <"$at_status_file" #AT_STOP_226 #AT_START_227 -at_fn_group_banner 227 'DMRTest.at:560' \ +at_fn_group_banner 227 'DMRTest.at:579' \ "filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20850,29 +21435,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:560: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:560" +$as_echo "$at_srcdir/DMRTest.at:579: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:579" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:579" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:560: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:560" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:579: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:579" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:579" $at_failed && at_fn_log_failure $at_traceon; } @@ -20880,28 +21468,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:560: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:560" +$as_echo "$at_srcdir/DMRTest.at:579: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:579" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:579" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:560: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:560" +$as_echo "$at_srcdir/DMRTest.at:579: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:579" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:579" $at_failed && at_fn_log_failure $at_traceon; } @@ -20915,7 +21503,7 @@ read at_status <"$at_status_file" #AT_STOP_227 #AT_START_228 -at_fn_group_banner 228 'DMRTest.at:567' \ +at_fn_group_banner 228 'DMRTest.at:586' \ "filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base" "" at_xfail=no test "Xpass" = "Xxfail" && at_xfail=yes @@ -20931,29 +21519,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:567: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:567" +$as_echo "$at_srcdir/DMRTest.at:586: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:586" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:586" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:567: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:567" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:586: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:586" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:586" $at_failed && at_fn_log_failure $at_traceon; } @@ -20961,28 +21552,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:567: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:567" +$as_echo "$at_srcdir/DMRTest.at:586: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:586" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:586" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:567: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:567" +$as_echo "$at_srcdir/DMRTest.at:586: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:586" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:586" $at_failed && at_fn_log_failure $at_traceon; } @@ -20996,7 +21587,7 @@ read at_status <"$at_status_file" #AT_STOP_228 #AT_START_229 -at_fn_group_banner 229 'DMRTest.at:568' \ +at_fn_group_banner 229 'DMRTest.at:587' \ "filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -21012,29 +21603,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:568: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:568" +$as_echo "$at_srcdir/DMRTest.at:587: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:587" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:587" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:568: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:568" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:587: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:587" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:587" $at_failed && at_fn_log_failure $at_traceon; } @@ -21042,28 +21636,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:568: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:568" +$as_echo "$at_srcdir/DMRTest.at:587: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:587" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:587" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:568: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:568" +$as_echo "$at_srcdir/DMRTest.at:587: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:587" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:587" $at_failed && at_fn_log_failure $at_traceon; } @@ -21077,7 +21671,7 @@ read at_status <"$at_status_file" #AT_STOP_229 #AT_START_230 -at_fn_group_banner 230 'DMRTest.at:569' \ +at_fn_group_banner 230 'DMRTest.at:588' \ "filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -21093,29 +21687,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:569: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:569" +$as_echo "$at_srcdir/DMRTest.at:588: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:588" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:588" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:569: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:569" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:588: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:588" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:588" $at_failed && at_fn_log_failure $at_traceon; } @@ -21123,28 +21720,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:569: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:569" +$as_echo "$at_srcdir/DMRTest.at:588: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:588" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:588" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:569: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:569" +$as_echo "$at_srcdir/DMRTest.at:588: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:588" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:588" $at_failed && at_fn_log_failure $at_traceon; } @@ -21158,7 +21755,7 @@ read at_status <"$at_status_file" #AT_STOP_230 #AT_START_231 -at_fn_group_banner 231 'DMRTest.at:571' \ +at_fn_group_banner 231 'DMRTest.at:590' \ "filter names_with_spaces2.dmr /inst2/\\\"Point Break\\\".x names_with_spaces2.dmr.1.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -21174,29 +21771,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:571: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:571" +$as_echo "$at_srcdir/DMRTest.at:590: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:590" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:590" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:571: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:571" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:590: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:590" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:590" $at_failed && at_fn_log_failure $at_traceon; } @@ -21204,28 +21804,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:571: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:571" +$as_echo "$at_srcdir/DMRTest.at:590: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:590" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:590" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:571: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:571" +$as_echo "$at_srcdir/DMRTest.at:590: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:590" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:590" $at_failed && at_fn_log_failure $at_traceon; } @@ -21239,7 +21839,7 @@ read at_status <"$at_status_file" #AT_STOP_231 #AT_START_232 -at_fn_group_banner 232 'DMRTest.at:572' \ +at_fn_group_banner 232 'DMRTest.at:591' \ "filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -21255,29 +21855,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:572: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:572" +$as_echo "$at_srcdir/DMRTest.at:591: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:591" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:591" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:572: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:572" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:591: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:591" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:591" $at_failed && at_fn_log_failure $at_traceon; } @@ -21285,28 +21888,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:572: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:572" +$as_echo "$at_srcdir/DMRTest.at:591: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:591" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:591" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:572: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:572" +$as_echo "$at_srcdir/DMRTest.at:591: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:591" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:591" $at_failed && at_fn_log_failure $at_traceon; } @@ -21320,7 +21923,7 @@ read at_status <"$at_status_file" #AT_STOP_232 #AT_START_233 -at_fn_group_banner 233 'DMRTest.at:573' \ +at_fn_group_banner 233 'DMRTest.at:592' \ "filter names_with_spaces2.dmr /inst2/\\\"Point%20Break\\\".x names_with_spaces2.dmr.1.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -21336,29 +21939,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:573: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:573" +$as_echo "$at_srcdir/DMRTest.at:592: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:592" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:592" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:573: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:573" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:592: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:592" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:592" $at_failed && at_fn_log_failure $at_traceon; } @@ -21366,28 +21972,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:573: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:573" +$as_echo "$at_srcdir/DMRTest.at:592: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:592" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:592" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:573: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:573" +$as_echo "$at_srcdir/DMRTest.at:592: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:592" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:592" $at_failed && at_fn_log_failure $at_traceon; } @@ -21401,7 +22007,7 @@ read at_status <"$at_status_file" #AT_STOP_233 #AT_START_234 -at_fn_group_banner 234 'DMRTest.at:575' \ +at_fn_group_banner 234 'DMRTest.at:594' \ "filter names_with_spaces3.dmr /inst2/\\\"New Group\\\"/x names_with_spaces3.dmr.1.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -21417,29 +22023,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:575: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:575" +$as_echo "$at_srcdir/DMRTest.at:594: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:594" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:594" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:575: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:575" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:594: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:594" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:594" $at_failed && at_fn_log_failure $at_traceon; } @@ -21447,28 +22056,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:575: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:575" +$as_echo "$at_srcdir/DMRTest.at:594: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:594" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:594" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:575: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:575" +$as_echo "$at_srcdir/DMRTest.at:594: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:594" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:594" $at_failed && at_fn_log_failure $at_traceon; } @@ -21482,7 +22091,7 @@ read at_status <"$at_status_file" #AT_STOP_234 #AT_START_235 -at_fn_group_banner 235 'DMRTest.at:576' \ +at_fn_group_banner 235 'DMRTest.at:595' \ "filter names_with_spaces3.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base" "" at_xfail=no test "Xxfail" = "Xxfail" && at_xfail=yes @@ -21498,29 +22107,32 @@ if test -n "$baselines" -a x$baselines = xyes; then : + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + { set +x -$as_echo "$at_srcdir/DMRTest.at:576: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:576" +$as_echo "$at_srcdir/DMRTest.at:595: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:595" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576" +at_fn_check_skip $at_status "$at_srcdir/DMRTest.at:595" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:576: mv stdout \$baseline.tmp" -at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:576" -( $at_check_trace; mv stdout $baseline.tmp +$as_echo "$at_srcdir/DMRTest.at:595: cat stdout stderr > \$baseline.tmp" +at_fn_check_prepare_dynamic "cat stdout stderr > $baseline.tmp" "DMRTest.at:595" +( $at_check_trace; cat stdout stderr > $baseline.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:595" $at_failed && at_fn_log_failure $at_traceon; } @@ -21528,28 +22140,28 @@ else { set +x -$as_echo "$at_srcdir/DMRTest.at:576: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " -at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:576" +$as_echo "$at_srcdir/DMRTest.at:595: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@[0-9a-f][0-9a-f]*@@' " +at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:595" ( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[0-9a-f][0-9a-f]*@@' ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:595" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/DMRTest.at:576: diff -b -B \$baseline stdout" -at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:576" +$as_echo "$at_srcdir/DMRTest.at:595: diff -b -B \$baseline stdout" +at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:595" ( $at_check_trace; diff -b -B $baseline stdout ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576" +at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:595" $at_failed && at_fn_log_failure $at_traceon; } diff -Nru libdap-3.20.4/tests/DMRTest.at libdap-3.20.5/tests/DMRTest.at --- libdap-3.20.4/tests/DMRTest.at 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/tests/DMRTest.at 2020-02-17 07:35:45.000000000 +0000 @@ -23,8 +23,8 @@ AS_IF([test -n "$baselines" -a x$baselines = xyes], [ - AT_CHECK([$abs_builddir/dmr-test -x -p $input || true], [], [stdout], []) - AT_CHECK([mv stdout $baseline.tmp]) + AT_CHECK([$abs_builddir/dmr-test -x -p $input], [ignore], [stdout], [stderr]) + AT_CHECK([cat stdout stderr > $baseline.tmp]) ], [ AT_CHECK([$abs_builddir/dmr-test -x -p $input || true], [], [stdout], [stderr]) @@ -52,8 +52,11 @@ AS_IF([test -n "$baselines" -a x$baselines = xyes], [ - AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) - AT_CHECK([mv stdout $baseline.tmp]) + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input], [0], [stdout], [ignore]) + + AT_CHECK([$abs_builddir/dmr-test -x -t $input], [ignore], [stdout], [stderr]) + AT_CHECK([cat stdout stderr > $baseline.tmp]) ], [ AT_CHECK([$abs_builddir/dmr-test -x -t $input || true], [], [stdout], [stderr]) @@ -83,8 +86,12 @@ AS_IF([test -n "$baselines" -a x$baselines = xyes], [ echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>" - AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [0], [stdout], [ignore]) - AT_CHECK([mv stdout $baseline.tmp]) + + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [0], [stdout], [ignore]) + + AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [ignore], [stdout], [stderr]) + AT_CHECK([cat stdout stderr > $baseline.tmp]) ], [ AT_CHECK([$abs_builddir/dmr-test -x -t $input | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], [ignore]) @@ -110,8 +117,11 @@ AS_IF([test -n "$baselines" -a x$baselines = xyes], [ - AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "$2"], [], [stdout], []) - AT_CHECK([mv stdout $baseline.tmp]) + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "$2"], [], [stdout], []) old version + + AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "$2"], [ignore], [stdout], [stderr]) + AT_CHECK([cat stdout stderr > $baseline.tmp]) ], [ AT_CHECK([$abs_builddir/dmr-test -x -t $input -c "$2" || true], [], [stdout], [stderr]) @@ -138,8 +148,11 @@ AS_IF([test -n "$baselines" -a x$baselines = xyes], [ - AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) - AT_CHECK([mv stdout $baseline.tmp]) + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [], [stdout], []) + + AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"], [ignore], [stdout], [stderr]) + AT_CHECK([cat stdout stderr > $baseline.tmp]) ], [ AT_CHECK([$abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true], [], [stdout], [stderr]) @@ -166,8 +179,11 @@ AS_IF([test -n "$baselines" -a x$baselines = xyes], [ - AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) - AT_CHECK([mv stdout $baseline.tmp]) + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) + + AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [ignore], [stdout], [stderr]) + AT_CHECK([cat stdout stderr > $baseline.tmp]) ], [ AT_CHECK([$abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@[[0-9a-f]][[0-9a-f]]*@@' ], [], [stdout], []) @@ -195,8 +211,11 @@ AS_IF([test -n "$baselines" -a x$baselines = xyes], [ - AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) - AT_CHECK([mv stdout $baseline.tmp]) + # // old version - sbl 9.4.19 + # AT_CHECK([$abs_builddir/dmr-test -x -i $input], [], [stdout], []) + + AT_CHECK([$abs_builddir/dmr-test -x -i $input], [ignore], [stdout], [stderr]) + AT_CHECK([cat stdout stderr > $baseline.tmp]) ], [ AT_CHECK([$abs_builddir/dmr-test -x -i $input || true], [], [stdout], [stderr]) Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/tests/dmr-testsuite/._test_simple_3_error_1.xml and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/tests/dmr-testsuite/._test_simple_3_error_1.xml differ diff -Nru libdap-3.20.4/tests/EXPRTest libdap-3.20.5/tests/EXPRTest --- libdap-3.20.4/tests/EXPRTest 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/tests/EXPRTest 2020-02-17 07:35:45.000000000 +0000 @@ -616,8 +616,8 @@ 24;EXPRTest.at:70;expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass);expr; 25;EXPRTest.at:71;expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass);expr; 26;EXPRTest.at:71;expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass);expr; -27;EXPRTest.at:80;expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass);expr; -28;EXPRTest.at:83;expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass);expr; +27;EXPRTest.at:81;expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass);expr; +28;EXPRTest.at:84;expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass);expr; 29;EXPRTest.at:89;expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass);expr; 30;EXPRTest.at:89;expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass);expr; 31;EXPRTest.at:91;expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass);expr; @@ -1066,7 +1066,7 @@ # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -libdap 3.20.4 test suite: expr-test test groups: +libdap 3.20.5 test suite: expr-test test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1107,7 +1107,7 @@ exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (libdap 3.20.4)" && + $as_echo "$as_me (libdap 3.20.5)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1284,11 +1284,11 @@ # Banners and logs. $as_echo "## ------------------------------------ ## -## libdap 3.20.4 test suite: expr-test. ## +## libdap 3.20.5 test suite: expr-test. ## ## ------------------------------------ ##" { $as_echo "## ------------------------------------ ## -## libdap 3.20.4 test suite: expr-test. ## +## libdap 3.20.5 test suite: expr-test. ## ## ------------------------------------ ##" echo @@ -2132,7 +2132,7 @@ $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [libdap 3.20.4] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [libdap 3.20.5] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may @@ -4331,7 +4331,7 @@ read at_status <"$at_status_file" #AT_STOP_26 #AT_START_27 -at_fn_group_banner 27 'EXPRTest.at:80' \ +at_fn_group_banner 27 'EXPRTest.at:81' \ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass)" "" at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4351,28 +4351,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/EXPRTest.at:80: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:80" +$as_echo "$at_srcdir/EXPRTest.at:81: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:81" ( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80" +at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/EXPRTest.at:80: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp" -at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp" "EXPRTest.at:80" +$as_echo "$at_srcdir/EXPRTest.at:81: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp" +at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp" "EXPRTest.at:81" ( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80" +at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81" $at_failed && at_fn_log_failure $at_traceon; } @@ -4380,28 +4380,28 @@ else { set +x -$as_echo "$at_srcdir/EXPRTest.at:80: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:80" +$as_echo "$at_srcdir/EXPRTest.at:81: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:81" ( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80" +at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/EXPRTest.at:80: diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stderr" -at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr" "EXPRTest.at:80" +$as_echo "$at_srcdir/EXPRTest.at:81: diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stderr" +at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr" "EXPRTest.at:81" ( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80" +at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81" $at_failed && at_fn_log_failure $at_traceon; } @@ -4415,7 +4415,7 @@ read at_status <"$at_status_file" #AT_STOP_27 #AT_START_28 -at_fn_group_banner 28 'EXPRTest.at:83' \ +at_fn_group_banner 28 'EXPRTest.at:84' \ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass)" "" at_xfail=no test "pass" = "xfail" && at_xfail=yes @@ -4435,28 +4435,28 @@ if test -n "$baselines" -a x$baselines = xyes; then : { set +x -$as_echo "$at_srcdir/EXPRTest.at:83: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:83" +$as_echo "$at_srcdir/EXPRTest.at:84: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:84" ( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83" +at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/EXPRTest.at:83: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp" -at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp" "EXPRTest.at:83" +$as_echo "$at_srcdir/EXPRTest.at:84: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp" +at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp" "EXPRTest.at:84" ( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83" +at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84" $at_failed && at_fn_log_failure $at_traceon; } @@ -4464,28 +4464,28 @@ else { set +x -$as_echo "$at_srcdir/EXPRTest.at:83: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" -at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:83" +$as_echo "$at_srcdir/EXPRTest.at:84: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" +at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:84" ( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo stderr:; tee stderr <"$at_stderr" echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83" +at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/EXPRTest.at:83: diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stderr" -at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr" "EXPRTest.at:83" +$as_echo "$at_srcdir/EXPRTest.at:84: diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stderr" +at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr" "EXPRTest.at:84" ( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83" +at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84" $at_failed && at_fn_log_failure $at_traceon; } diff -Nru libdap-3.20.4/tests/getdapTest libdap-3.20.5/tests/getdapTest --- libdap-3.20.4/tests/getdapTest 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/tests/getdapTest 2020-02-17 07:35:45.000000000 +0000 @@ -902,7 +902,7 @@ # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -libdap 3.20.4 test suite: getdap test groups: +libdap 3.20.5 test suite: getdap test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -943,7 +943,7 @@ exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (libdap 3.20.4)" && + $as_echo "$as_me (libdap 3.20.5)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1120,11 +1120,11 @@ # Banners and logs. $as_echo "## --------------------------------- ## -## libdap 3.20.4 test suite: getdap. ## +## libdap 3.20.5 test suite: getdap. ## ## --------------------------------- ##" { $as_echo "## --------------------------------- ## -## libdap 3.20.4 test suite: getdap. ## +## libdap 3.20.5 test suite: getdap. ## ## --------------------------------- ##" echo @@ -1968,7 +1968,7 @@ $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [libdap 3.20.4] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [libdap 3.20.5] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may diff -Nru libdap-3.20.4/tests/Makefile.in libdap-3.20.5/tests/Makefile.in --- libdap-3.20.4/tests/Makefile.in 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/tests/Makefile.in 2020-02-17 07:35:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -756,6 +756,7 @@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ diff -Nru libdap-3.20.4/tests/package.m4 libdap-3.20.5/tests/package.m4 --- libdap-3.20.4/tests/package.m4 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/tests/package.m4 2020-02-17 07:35:45.000000000 +0000 @@ -1,6 +1,6 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [libdap]) m4_define([AT_PACKAGE_TARNAME], [libdap]) -m4_define([AT_PACKAGE_VERSION], [3.20.4]) -m4_define([AT_PACKAGE_STRING], [libdap 3.20.4]) +m4_define([AT_PACKAGE_VERSION], [3.20.5]) +m4_define([AT_PACKAGE_STRING], [libdap 3.20.5]) m4_define([AT_PACKAGE_BUGREPORT], [opendap-tech@opendap.org]) diff -Nru libdap-3.20.4/unit-tests/cache-testsuite/Makefile.in libdap-3.20.5/unit-tests/cache-testsuite/Makefile.in --- libdap-3.20.4/unit-tests/cache-testsuite/Makefile.in 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/unit-tests/cache-testsuite/Makefile.in 2020-02-17 07:35:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -598,6 +598,7 @@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -858,9 +859,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu unit-tests/cache-testsuite/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign unit-tests/cache-testsuite/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu unit-tests/cache-testsuite/Makefile + $(AUTOMAKE) --foreign unit-tests/cache-testsuite/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/chunked-io/test_big_binary_file_2.bin.chunked and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/chunked-io/test_big_binary_file_2.bin.chunked differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/chunked-io/test_big_binary_file_2.bin.plain and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/chunked-io/test_big_binary_file_2.bin.plain differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/chunked-io/test_big_binary_file.bin.chunked and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/chunked-io/test_big_binary_file.bin.chunked differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/chunked-io/test_big_binary_file.bin.plain and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/chunked-io/test_big_binary_file.bin.plain differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/chunked-io/test_small_text_file.txt.chunked and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/chunked-io/test_small_text_file.txt.chunked differ diff -Nru libdap-3.20.4/unit-tests/chunked-io/test_small_text_file.txt.plain libdap-3.20.5/unit-tests/chunked-io/test_small_text_file.txt.plain --- libdap-3.20.4/unit-tests/chunked-io/test_small_text_file.txt.plain 1970-01-01 00:00:00.000000000 +0000 +++ libdap-3.20.5/unit-tests/chunked-io/test_small_text_file.txt.plain 2020-02-17 07:35:45.000000000 +0000 @@ -0,0 +1 @@ +This is a small file Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/chunked-io/test_text_file.txt.chunked and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/chunked-io/test_text_file.txt.chunked differ diff -Nru libdap-3.20.4/unit-tests/chunked-io/test_text_file.txt.plain libdap-3.20.5/unit-tests/chunked-io/test_text_file.txt.plain --- libdap-3.20.4/unit-tests/chunked-io/test_text_file.txt.plain 1970-01-01 00:00:00.000000000 +0000 +++ libdap-3.20.5/unit-tests/chunked-io/test_text_file.txt.plain 2020-02-17 07:35:45.000000000 +0000 @@ -0,0 +1,370 @@ + +// -*- mode: c++; c-basic-offset:4 -*- + +// This file is part of libdap, A C++ implementation of the OPeNDAP Data +// Access Protocol. + +// Copyright (c) 2003 OPeNDAP, Inc. +// Author: James Gallagher +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112. + +// Tests for the AISMerge class. + +#include +#include +#include + +//#define DODS_DEBUG + +#include "Connect.h" +#include "AISMerge.h" +#include "debug.h" +#include + +#include "testFile.h" + +using namespace CppUnit; + +namespace libdap +{ + +class AISMergeTest:public TestFixture { + private: + AISMerge * ais_merge; + + static string fnoc1, fnoc2, fnoc3, bears, coads, three_fnoc; + static string fnoc1_ais, fnoc2_ais, digit_ais, fnoc3_das; + + static string fnoc1_ais_string, bears_1_ais_string, coads_ais_string; + static string fnoc1_merge_ais, fnoc2_merge_ais, fnoc3_merge_ais; + static string three_fnoc_merge_ais, starts_with_number_ais_string; + + string dump2string(FILE * res) { + string stuff = ""; + char line[256]; + while (!feof(res) && !ferror(res) + && fgets(&line[0], 256, res) != 0) + stuff += line; + + return stuff; + } public: + AISMergeTest() { + } + ~AISMergeTest() { + } + + void setUp() { + ais_merge = new AISMerge("ais_testsuite/ais_database.xml"); + } + + void tearDown() { + delete ais_merge; + ais_merge = 0; + } + + CPPUNIT_TEST_SUITE(AISMergeTest); + + CPPUNIT_TEST(get_ais_resource_test); + CPPUNIT_TEST(merge_test); + + CPPUNIT_TEST_SUITE_END(); + + void get_ais_resource_test() { + try { + ResourceVector rv = ais_merge->d_ais_db.get_resource(fnoc1); + Response *res = ais_merge->get_ais_resource(rv[0].get_url()); + string stuff = dump2string(res->get_stream()); + DBG(cerr << "AIS Resource: " << stuff << endl); + CPPUNIT_ASSERT(stuff.find(fnoc1_ais_string) + != string::npos); + + rv = ais_merge->d_ais_db.get_resource(coads); + res = ais_merge->get_ais_resource(rv[0].get_url()); + CPPUNIT_ASSERT(dump2string(res->get_stream()). + find(coads_ais_string) + != string::npos); + + rv = ais_merge->d_ais_db.get_resource(three_fnoc); + res = ais_merge->get_ais_resource(rv[0].get_url()); + CPPUNIT_ASSERT(dump2string(res->get_stream()). + find(starts_with_number_ais_string) + != string::npos); + } + catch(Error & e) { + cerr << "Error: " << e.get_error_message() << endl; + // If the exception is Not Found then this is not an error; there + // are many reasons why the resource might not be found... + if (e.get_error_message().find("Not Found:") == string::npos) + CPPUNIT_ASSERT(!"Error"); + } + } + + void merge_test() { + try { + Connect *conn; + DAS das; + string sof; + + conn = new Connect(fnoc1); // test overwrite (default) + conn->request_das(das); + ais_merge->merge(fnoc1, das); + FILE2string(sof, of, das.print(of)); + DBG(cerr << "Merged fnoc1 DAS: " << sof << endl); + CPPUNIT_ASSERT(sof.find(fnoc1_merge_ais) != string::npos); + + delete conn; + conn = 0; + das.erase(); + + conn = new Connect(fnoc2); // test replace + conn->request_das(das); + ais_merge->merge(fnoc2, das); + FILE2string(sof, of, das.print(of)); + CPPUNIT_ASSERT(sof.find(fnoc2_merge_ais) != string::npos); + + delete conn; + conn = 0; + das.erase(); + + conn = new Connect(fnoc3); // test fallback + conn->request_das(das); // with a non-empty das, nothing happens + ais_merge->merge(fnoc3, das); + FILE2string(sof, of, das.print(of)); + CPPUNIT_ASSERT(sof.find(fnoc3_das) != string::npos); + + das.erase(); // empty das, should add attributes + ais_merge->merge(fnoc3, das); + FILE2string(sof, of, das.print(of)); + CPPUNIT_ASSERT(sof.find(fnoc3_merge_ais) != string::npos); + + conn = new Connect(three_fnoc); // test regexp + conn->request_das(das); // with a non-empty das, nothing happens + ais_merge->merge(three_fnoc, das); + FILE2string(sof, of, das.print(of)); + CPPUNIT_ASSERT(sof.find(three_fnoc_merge_ais) + != string::npos); + } + catch(Error & e) { + cerr << "Error: " << e.get_error_message() << endl; + if (e.get_error_message().find("Not Found:") == string::npos) + CPPUNIT_ASSERT(!"Error"); + } + } +}; + +string AISMergeTest::fnoc1 = + "http://test.opendap.org/opendap/data/nc/fnoc1.nc"; +string AISMergeTest::fnoc2 = + "http://test.opendap.org/opendap/data/nc/fnoc2.nc"; +string AISMergeTest::fnoc3 = + "http://test.opendap.org/opendap/data/nc/fnoc3.nc"; +string AISMergeTest::bears = + "http://test.opendap.org/opendap/data/nc/bears.nc"; +string AISMergeTest::coads = + "http://test.opendap.org/opendap/data/nc/coads_climatology.nc"; +string AISMergeTest::three_fnoc = + "http://test.opendap.org/opendap/data/nc/3fnoc.nc"; + +string AISMergeTest::fnoc1_ais = + "http://test.opendap.org/ais/fnoc1.nc.das"; +string AISMergeTest::fnoc2_ais = + "http://test.opendap.org/ais/fnoc2.nc.das"; +string AISMergeTest::digit_ais = (string)TEST_SRC_DIR + "/ais_testsuite/starts_with_number.das"; + +string AISMergeTest::fnoc1_ais_string = "Attributes {\n\ + u {\n\ + String DODS_Name \"UWind\";\n\ + }\n\ + v {\n\ + String DODS_Name \"VWind\";\n\ + }\n\ +}"; + +string AISMergeTest::bears_1_ais_string = "Attributes {\n\ + bears {\n\ + String longname \"Test data\";\n\ + }\n\ +}"; + +string AISMergeTest::coads_ais_string = "Attributes {\n\ + COADSX {\n\ + String long_name \"Longitude\";\n\ + }\n\ +}"; + +string AISMergeTest::starts_with_number_ais_string = "Attributes {\n\ + NC_GLOBAL {\n\ + String AIS_Test_info \"This dataset's name starts with a digit.\";\n\ + }\n\ +}"; + +string AISMergeTest::fnoc3_das = "Attributes {\n\ + u {\n\ + String units \"meter per second\";\n\ + String long_name \"Vector wind eastward component\";\n\ + String missing_value \"-32767\";\n\ + String scale_factor \"0.005\";\n\ + }\n\ + v {\n\ + String units \"meter per second\";\n\ + String long_name \"Vector wind northward component\";\n\ + String missing_value \"-32767\";\n\ + String scale_factor \"0.005\";\n\ + }\n\ + lat {\n\ + String units \"degree North\";\n\ + }\n\ + lon {\n\ + String units \"degree East\";\n\ + }\n\ + time {\n\ + String units \"hours from base_time\";\n\ + }\n\ + NC_GLOBAL {\n\ + String base_time \"88-245-00:00:00\";\n\ + String title \" FNOC UV wind components from 1988-245 to 1988-247.\";\n\ + }\n\ + DODS_EXTRA {\n\ + String Unlimited_Dimension \"time_a\";\n\ + }\n\ +}"; + +string AISMergeTest::fnoc1_merge_ais = "Attributes {\n\ + u {\n\ + String units \"meter per second\";\n\ + String long_name \"Vector wind eastward component\";\n\ + String missing_value \"-32767\";\n\ + String scale_factor \"0.005\";\n\ + String DODS_Name \"UWind\", \"UWind\";\n\ + Byte b 128;\n\ + Int32 i 32000;\n\ + Url WOA01 \"http://localhost/junk\";\n\ + }\n\ + v {\n\ + String units \"meter per second\";\n\ + String long_name \"Vector wind northward component\";\n\ + String missing_value \"-32767\";\n\ + String scale_factor \"0.005\";\n\ + String DODS_Name \"VWind\", \"VWind\";\n\ + }\n\ + lat {\n\ + String units \"degree North\";\n\ + }\n\ + lon {\n\ + String units \"degree East\";\n\ + }\n\ + time {\n\ + String units \"hours from base_time\";\n\ + }\n\ + NC_GLOBAL {\n\ + String base_time \"88- 10-00:00:00\";\n\ + String title \" FNOC UV wind components from 1988- 10 to 1988- 13.\";\n\ + }\n\ + DODS_EXTRA {\n\ + String Unlimited_Dimension \"time_a\";\n\ + }\n\ +}"; + +string AISMergeTest::fnoc2_merge_ais = "Attributes {\n\ + u {\n\ + String units \"meter per second\";\n\ + String long_name \"UWind\";\n\ + }\n\ + v {\n\ + String units \"meter per second\";\n\ + String long_name \"VWind\";\n\ + }\n\ + lat {\n\ + String units \"degree North\";\n\ + String long_name \"Latitude\";\n\ + }\n\ + lon {\n\ + String units \"degree East\";\n\ + String long_name \"Longitude\";\n\ + }\n\ + time {\n\ + }\n\ + NC_GLOBAL {\n\ + }\n\ + DODS_EXTRA {\n\ + }\n\ +}"; + +string AISMergeTest::fnoc3_merge_ais = "Attributes {\n\ + u {\n\ + String long_name \"UWind\";\n\ + }\n\ + v {\n\ + String long_name \"VWind\";\n\ + }\n\ + lat {\n\ + String long_name \"Latitude\";\n\ + }\n\ + lon {\n\ + String long_name \"Longitude\";\n\ + }\n\ +}"; + +string AISMergeTest::three_fnoc_merge_ais = "Attributes {\n\ + u {\n\ + String long_name \"UWind\", \"Vector wind eastward component\";\n\ + String units \"meter per second\";\n\ + String missing_value \"-32767\";\n\ + String scale_factor \"0.005\";\n\ + }\n\ + v {\n\ + String long_name \"VWind\", \"Vector wind northward component\";\n\ + String units \"meter per second\";\n\ + String missing_value \"-32767\";\n\ + String scale_factor \"0.005\";\n\ + }\n\ + lat {\n\ + String long_name \"Latitude\";\n\ + String units \"degree North\";\n\ + }\n\ + lon {\n\ + String long_name \"Longitude\";\n\ + String units \"degree East\";\n\ + }\n\ + time {\n\ + String units \"hours from base_time\";\n\ + }\n\ + NC_GLOBAL {\n\ + String base_time \"88-245-00:00:00\";\n\ + String title \" FNOC UV wind components from 1988-245 to 1988-247.\";\n\ + String AIS_Test_info \"This dataset's name starts with a digit.\";\n\ + }\n\ + DODS_EXTRA {\n\ + String Unlimited_Dimension \"time_a\";\n\ + }\n\ +}"; + +CPPUNIT_TEST_SUITE_REGISTRATION(AISMergeTest); + +} // namespace libdap + +int main(int, char **) +{ + CppUnit::TextTestRunner runner; + runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest()); + + bool wasSuccessful = runner.run("", false); + + return wasSuccessful ? 0 : 1; +} + Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/D4-xml/._coads_climatology.nc.xml and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/D4-xml/._coads_climatology.nc.xml differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/dmr-rt-testsuite/._attr_test_01.dds and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/dmr-rt-testsuite/._attr_test_01.dds differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/dmr-testsuite/._coads_climatology.nc.full.dmr and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/dmr-testsuite/._coads_climatology.nc.full.dmr differ Binary files /tmp/tmpL160PW/5fDXwXmKPF/libdap-3.20.4/unit-tests/._HTTPConnectTest.cc and /tmp/tmpL160PW/W6iAYXbzSn/libdap-3.20.5/unit-tests/._HTTPConnectTest.cc differ diff -Nru libdap-3.20.4/unit-tests/Makefile.in libdap-3.20.5/unit-tests/Makefile.in --- libdap-3.20.4/unit-tests/Makefile.in 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/unit-tests/Makefile.in 2020-02-17 07:35:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -1241,6 +1241,7 @@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ LTLIBTHREAD = @LTLIBTHREAD@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ diff -Nru libdap-3.20.4/unit-tests/test_config.h libdap-3.20.5/unit-tests/test_config.h --- libdap-3.20.4/unit-tests/test_config.h 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/unit-tests/test_config.h 2020-02-17 07:35:45.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef E_test_config_h #define E_test_config_h -#define TEST_SRC_DIR "/home/centos/hyrax/libdap4/unit-tests" +#define TEST_SRC_DIR "/Users/ndp/OPeNDAP/hyrax/libdap4/unit-tests" #endif diff -Nru libdap-3.20.4/xdr-datatypes.h libdap-3.20.5/xdr-datatypes.h --- libdap-3.20.4/xdr-datatypes.h 2019-07-15 09:17:16.000000000 +0000 +++ libdap-3.20.5/xdr-datatypes.h 2020-02-17 07:35:45.000000000 +0000 @@ -20,10 +20,10 @@ #define XDR_INT32 xdr_int32_t -#define XDR_UINT32 xdr_uint32_t +#define XDR_UINT32 xdr_u_int32_t #define XDR_INT16 xdr_int16_t -#define XDR_UINT16 xdr_uint16_t +#define XDR_UINT16 xdr_u_int16_t #define XDR_FLOAT64 xdr_double #define XDR_FLOAT32 xdr_float